(tool-bar-add-item-from-menu): Handle

old-style menu definitions.

lisp/ChangeLog

+2001-08-06  Gerd Moellmann  <gerd@gnu.org>
+
+	* toolbar/tool-bar.el (tool-bar-add-item-from-menu): Handle
+	old-style menu definitions.
+
 2001-08-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* textmodes/makeinfo.el, textmodes/page-ext.el, textmodes/page.el,
-	textmodes/text-mode.el, textmodes/two-column.el: Keywords added.
+	* textmodes/text-mode.el, textmodes/two-column.el: Keywords added.
 
 	* play/studly.el, mail/unrmail.el, emacs-lisp/lucid.el,
-	emulation/pc-mode.el, diff.el, textmodes/fill.el, abbrev.el,
-	add-log.el, faces.el, mail/sc.el: specify FSF as Maintainer.
+	* emulation/pc-mode.el, diff.el, textmodes/fill.el, abbrev.el,
+	* add-log.el, faces.el, mail/sc.el: Specify FSF as Maintainer.
 
 2001-08-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 

lisp/toolbar/tool-bar.el

 ;;; tool-bar.el --- setting up the tool bar
 ;;
-;; Copyright (C) 2000 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001 Free Software Foundation, Inc.
 ;;
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: mouse frames
@@ -164,8 +164,14 @@ function."
 	(setq submap (eval submap)))
       (unless (image-mask-p image)
 	(setq image (append image '(:mask heuristic))))
-      (define-key-after tool-bar-map (vector key)
-	(append (cdr (assq key (cdr submap))) (list :image image) props)))))
+      (let ((defn (assq key (cdr submap))))
+	(if (eq (cadr defn) 'menu-item)
+	    (define-key-after tool-bar-map (vector key)
+	      (append (cdr defn) (list :image image) props))
+	  (setq defn (cdr defn))
+	  (define-key-after tool-bar-map (vector key)
+	    (append `(menu-item ,(car defn) ,(cddr defn))
+		    (list :image image) props)))))))
 
 ;;; Set up some global items.  Additions/deletions up for grabs.
 

src/ChangeLog

+2001-08-06  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
+
+	* alloc.c (init_stack): Remove declaration.
+
 2001-08-03  Gerd Moellmann  <gerd@gnu.org>
 
 	* keyboard.c (read_key_sequence): Check that key is an integer