(imenu--mouse-menu): Always use nested keymaps.
(imenu-use-keymap-menu): Variable deleted.
This commit is contained in:
parent
753c130989
commit
fdbf0fc738
1 changed files with 4 additions and 10 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue