diff options
| author | Andreas Schwab | 2004-11-06 14:43:43 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2004-11-06 14:43:43 +0000 |
| commit | cffe562a9f6b41ba541daf86af7aba1883cc1c22 (patch) | |
| tree | 3dcbc9d6a4d70e373bbfc16b17a5b35d1fc6ae58 | |
| parent | 98961e08e5e8d0c69a849696e6af4e3cd9faaa4a (diff) | |
| download | emacs-cffe562a9f6b41ba541daf86af7aba1883cc1c22.tar.gz emacs-cffe562a9f6b41ba541daf86af7aba1883cc1c22.zip | |
(easy-menu-get-map): Fix last change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easymenu.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9f4fd1b78b9..a108244d62c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2004-11-06 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * emacs-lisp/easymenu.el (easy-menu-get-map): Fix last change. | ||
| 4 | |||
| 1 | 2004-11-06 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2004-11-06 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * emacs-lisp/easymenu.el (easy-menu-get-map-look-for-name): Remove. | 7 | * emacs-lisp/easymenu.el (easy-menu-get-map-look-for-name): Remove. |
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el index 91de4e670f7..7b18756fd7e 100644 --- a/lisp/emacs-lisp/easymenu.el +++ b/lisp/emacs-lisp/easymenu.el | |||
| @@ -622,7 +622,7 @@ In some cases we use that to select between the local and global maps." | |||
| 622 | (catch 'found | 622 | (catch 'found |
| 623 | (if (and map (symbolp map) (not (keymapp map))) | 623 | (if (and map (symbolp map) (not (keymapp map))) |
| 624 | (setq map (symbol-value map))) | 624 | (setq map (symbol-value map))) |
| 625 | (let ((maps (or map (current-active-maps)))) | 625 | (let ((maps (if map (list map) (current-active-maps)))) |
| 626 | ;; Look for PATH in each map. | 626 | ;; Look for PATH in each map. |
| 627 | (unless map (push 'menu-bar path)) | 627 | (unless map (push 'menu-bar path)) |
| 628 | (dolist (name path) | 628 | (dolist (name path) |