[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/easymenu.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/easymenu.el
diff -c emacs/lisp/emacs-lisp/easymenu.el:1.70 
emacs/lisp/emacs-lisp/easymenu.el:1.71
*** emacs/lisp/emacs-lisp/easymenu.el:1.70      Wed Nov 10 15:15:43 2004
--- emacs/lisp/emacs-lisp/easymenu.el   Wed Nov 10 16:20:20 2004
***************
*** 523,537 ****
        (easy-menu-define-key map (easy-menu-intern (car item))
                            (cdr item) before)
      (if (or (keymapp item)
!           (and (symbolp item) (keymapp (symbol-value item))))
        ;; Item is a keymap, find the prompt string and use as item name.
!       (let ((tail (easy-menu-get-map item nil)) name)
!         (if (not (keymapp item)) (setq item tail))
!         (while (and (null name) (consp (setq tail (cdr tail)))
!                     (not (keymapp tail)))
!           (if (stringp (car tail)) (setq name (car tail)) ; Got a name.
!             (setq tail (cdr tail))))
!         (setq item (cons name item))))
      (easy-menu-do-add-item map item before)))
  
  (defun easy-menu-item-present-p (map path name)
--- 523,532 ----
        (easy-menu-define-key map (easy-menu-intern (car item))
                            (cdr item) before)
      (if (or (keymapp item)
!           (and (symbolp item) (keymapp (symbol-value item))
!                (setq item (symbol-value item))))
        ;; Item is a keymap, find the prompt string and use as item name.
!       (setq item (cons (keymap-prompt item) item)))
      (easy-menu-do-add-item map item before)))
  
  (defun easy-menu-item-present-p (map path name)