diff options
| -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 @@ | |||
| 64 | ;;; Customizable variables | 64 | ;;; Customizable variables |
| 65 | ;;; | 65 | ;;; |
| 66 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 66 | ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
| 67 | (defvar imenu-use-keymap-menu nil | ||
| 68 | "*Non-nil means use a keymap when making the mouse menu.") | ||
| 69 | 67 | ||
| 70 | (defvar imenu-auto-rescan nil | 68 | (defvar imenu-auto-rescan nil |
| 71 | "*Non-nil means Imenu should always rescan the buffers.") | 69 | "*Non-nil means Imenu should always rescan the buffers.") |
| @@ -709,14 +707,10 @@ Returns t for rescan and otherwise a position number." | |||
| 709 | index-alist) | 707 | index-alist) |
| 710 | (or title (buffer-name)))) | 708 | (or title (buffer-name)))) |
| 711 | position) | 709 | position) |
| 712 | (and imenu-use-keymap-menu | 710 | (setq menu (imenu--create-keymap-1 (car menu) |
| 713 | (setq menu (imenu--create-keymap-1 (car menu) | 711 | (if (< 1 (length (cdr menu))) |
| 714 | (if (< 1 (length (cdr menu))) | 712 | (cdr menu) |
| 715 | (cdr menu) | 713 | (cdr (cadr menu))))) |
| 716 | (cdr (cadr menu)))))) | ||
| 717 | |||
| 718 | (or imenu-use-keymap-menu | ||
| 719 | (setq menu (list "Imenu" (delq nil menu)))) | ||
| 720 | (setq position (x-popup-menu event menu)) | 714 | (setq position (x-popup-menu event menu)) |
| 721 | (if imenu-use-keymap-menu | 715 | (if imenu-use-keymap-menu |
| 722 | (progn | 716 | (progn |