diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-06-10 17:30:50 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-06-10 17:30:50 +0000 |
| commit | 1fdcc59306133608d32d5e7f06d34705e5528e4d (patch) | |
| tree | 6fe22fa4088faa81d253f24e22464cf45ab59afc /lisp | |
| parent | 7a9d1e81406ecfafa8ddca06e090b86ef3f658f4 (diff) | |
| download | emacs-1fdcc59306133608d32d5e7f06d34705e5528e4d.tar.gz | |
(imenu--mouse-menu): Always use nested keymaps.
(imenu-use-keymap-menu): Variable deleted.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/imenu.el | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el index e4af044db13..b555ba83b30 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -64,8 +64,6 @@ ;;; Customizable variables ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defvar imenu-use-keymap-menu nil - "*Non-nil means use a keymap when making the mouse menu.") (defvar imenu-auto-rescan nil "*Non-nil means Imenu should always rescan the buffers.") @@ -709,14 +707,10 @@ Returns t for rescan and otherwise a position number." index-alist) (or title (buffer-name)))) position) - (and imenu-use-keymap-menu - (setq menu (imenu--create-keymap-1 (car menu) - (if (< 1 (length (cdr menu))) - (cdr menu) - (cdr (cadr menu)))))) - - (or imenu-use-keymap-menu - (setq menu (list "Imenu" (delq nil menu)))) + (setq menu (imenu--create-keymap-1 (car menu) + (if (< 1 (length (cdr menu))) + (cdr menu) + (cdr (cadr menu))))) (setq position (x-popup-menu event menu)) (if imenu-use-keymap-menu (progn |