/[emacs]/emacs/lisp/emacs-lisp/easymenu.el
ViewVC logotype

Diff of /emacs/lisp/emacs-lisp/easymenu.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.56 by rms, Mon Dec 23 17:59:04 2002 UTC revision 1.57 by monnier, Sun Mar 16 00:39:23 2003 UTC
# Line 343  MENU, just change it, otherwise put it l Line 343  MENU, just change it, otherwise put it l
343                             (postfix                             (postfix
344                              (if (< (match-end 1) (match-end 0))                              (if (< (match-end 1) (match-end 0))
345                                  (substring keys (match-end 1))))                                  (substring keys (match-end 1))))
346                             (cmd (intern (substring keys (match-beginning 2)                             (cmd (intern (match-string 2 keys))))
                                                    (match-end 2)))))  
347                         (setq keys (and (or prefix postfix)                         (setq keys (and (or prefix postfix)
348                                         (cons prefix postfix)))                                         (cons prefix postfix)))
349                         (setq keys                         (setq keys
# Line 421  NAME can be either a string, or a symbol Line 420  NAME can be either a string, or a symbol
420            (eq (car-safe item) name)            (eq (car-safe item) name)
421          (if (stringp name)          (if (stringp name)
422              ;; Match against the text that is displayed to the user.              ;; Match against the text that is displayed to the user.
423              (or (member-ignore-case name item)              (or (condition-case nil (member-ignore-case name item)
424                      (error nil))          ;`item' might not be a proper list.
425                  ;; Also check the string version of the symbol name,                  ;; Also check the string version of the symbol name,
426                  ;; for backwards compatibility.                  ;; for backwards compatibility.
427                  (eq (car-safe item) (intern name)))))))                  (eq (car-safe item) (intern name))
428                    (eq (car-safe item) (easy-menu-intern name)))))))
429    
430  (defun easy-menu-always-true (x)  (defun easy-menu-always-true (x)
431    "Return true if form X never evaluates to nil."    "Return true if form X never evaluates to nil."
# Line 515  submenu is then traversed recursively wi Line 516  submenu is then traversed recursively wi
516  ITEM is either defined as in `easy-menu-define' or a non-nil value returned  ITEM is either defined as in `easy-menu-define' or a non-nil value returned
517  by `easy-menu-item-present-p' or `easy-menu-remove-item' or a menu defined  by `easy-menu-item-present-p' or `easy-menu-remove-item' or a menu defined
518  earlier by `easy-menu-define' or `easy-menu-create-menu'."  earlier by `easy-menu-define' or `easy-menu-create-menu'."
519      (unless map
520        (setq map (current-global-map))
521        (push 'menu-bar path))
522    (setq map (easy-menu-get-map map path    (setq map (easy-menu-get-map map path
523                                 (and (null map) (null path)                                 (and (null map) (null path)
524                                      (stringp (car-safe item))                                      (stringp (car-safe item))

Legend:
Removed from v.1.56  
changed lines
  Added in v.1.57

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26