[Emacs-diffs] Changes to emacs/lisp/toolbar/tool-bar.el

[Richard M. Stallman]

Index: emacs/lisp/toolbar/tool-bar.el
diff -c emacs/lisp/toolbar/tool-bar.el:1.29 emacs/lisp/toolbar/tool-bar.el:1.30
*** emacs/lisp/toolbar/tool-bar.el:1.29 Thu Apr 18 20:09:20 2002
--- emacs/lisp/toolbar/tool-bar.el      Sat May  4 23:06:51 2002
***************
*** 208,215 ****
              (append (cdr defn) (list :image image) props))
          (setq defn (cdr defn))
          (define-key-after in-map (vector key)
!           (append `(menu-item ,(car defn) ,(cdr defn))
!                   (list :image image) props)))))))
  
  ;;; Set up some global items.  Additions/deletions up for grabs.
  
--- 208,220 ----
              (append (cdr defn) (list :image image) props))
          (setq defn (cdr defn))
          (define-key-after in-map (vector key)
!           (let ((rest (cdr defn)))
!             ;; If the rest of the definition starts
!             ;; with a list of menu cache info, get rid of that.
!             (if (and (consp rest) (consp (car rest)))
!                 (setq rest (cdr rest)))
!             (append `(menu-item ,(car defn) ,rest)
!                     (list :image image) props))))))))
  
  ;;; Set up some global items.  Additions/deletions up for grabs.