[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.56 
emacs/lisp/emacs-lisp/easymenu.el:1.57
*** emacs/lisp/emacs-lisp/easymenu.el:1.56      Mon Dec 23 12:59:04 2002
--- emacs/lisp/emacs-lisp/easymenu.el   Sat Mar 15 19:39:23 2003
***************
*** 343,350 ****
                           (postfix
                            (if (< (match-end 1) (match-end 0))
                                (substring keys (match-end 1))))
!                          (cmd (intern (substring keys (match-beginning 2)
!                                                  (match-end 2)))))
                       (setq keys (and (or prefix postfix)
                                       (cons prefix postfix)))
                       (setq keys
--- 343,349 ----
                           (postfix
                            (if (< (match-end 1) (match-end 0))
                                (substring keys (match-end 1))))
!                          (cmd (intern (match-string 2 keys))))
                       (setq keys (and (or prefix postfix)
                                       (cons prefix postfix)))
                       (setq keys
***************
*** 421,430 ****
          (eq (car-safe item) name)
        (if (stringp name)
            ;; Match against the text that is displayed to the user.
!           (or (member-ignore-case name item)
                ;; Also check the string version of the symbol name,
                ;; for backwards compatibility.
!               (eq (car-safe item) (intern name)))))))
  
  (defun easy-menu-always-true (x)
    "Return true if form X never evaluates to nil."
--- 420,431 ----
          (eq (car-safe item) name)
        (if (stringp name)
            ;; Match against the text that is displayed to the user.
!           (or (condition-case nil (member-ignore-case name item)
!                 (error nil))          ;`item' might not be a proper list.
                ;; Also check the string version of the symbol name,
                ;; for backwards compatibility.
!               (eq (car-safe item) (intern name))
!               (eq (car-safe item) (easy-menu-intern name)))))))
  
  (defun easy-menu-always-true (x)
    "Return true if form X never evaluates to nil."
***************
*** 515,520 ****
--- 516,524 ----
  ITEM is either defined as in `easy-menu-define' or a non-nil value returned
  by `easy-menu-item-present-p' or `easy-menu-remove-item' or a menu defined
  earlier by `easy-menu-define' or `easy-menu-create-menu'."
+   (unless map
+     (setq map (current-global-map))
+     (push 'menu-bar path))
    (setq map (easy-menu-get-map map path
                               (and (null map) (null path)
                                    (stringp (car-safe item))