diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-06-12 15:00:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-06-12 15:00:48 +0000 |
| commit | 96996c3d3f2effcf408dfc59200fba4425dfa4f4 (patch) | |
| tree | 7131ff6e97177b3c189a89fe40d1eea199308ca4 /lisp/imenu.el | |
| parent | 875f33098c60530debf5763e83b521dee3086267 (diff) | |
| download | emacs-96996c3d3f2effcf408dfc59200fba4425dfa4f4.tar.gz | |
(imenu--mouse-menu): Don't check imenu-use-keymap-menu.
Diffstat (limited to 'lisp/imenu.el')
| -rw-r--r-- | lisp/imenu.el | 52 |
1 files changed, 24 insertions, 28 deletions
diff --git a/lisp/imenu.el b/lisp/imenu.el index b555ba83b30..0ad476ad48f 100644 --- a/lisp/imenu.el +++ b/lisp/imenu.el @@ -712,34 +712,30 @@ Returns t for rescan and otherwise a position number." (cdr menu) (cdr (cadr menu))))) (setq position (x-popup-menu event menu)) - (if imenu-use-keymap-menu - (progn - (cond - ((and (listp position) - (numberp (car position)) - (stringp (nth (1- (length position)) position))) - (setq position (nth (1- (length position)) position))) - ((and (stringp (car position)) - (null (cdr position))) - (setq position (car position)))))) - (cond - ((eq position nil) - position) - ((listp position) - (imenu--mouse-menu position event - (if title - (concat title imenu-level-separator - (car (rassq position index-alist))) - (car (rassq position index-alist))))) - ((stringp position) - (or (string= position (car imenu--rescan-item)) - (imenu--in-alist position index-alist))) - ((or (= position (cdr imenu--rescan-item)) - (and (stringp position) - (string= position (car imenu--rescan-item)))) - t) - (t - (rassq position index-alist))))) + (cond ((and (listp position) + (numberp (car position)) + (stringp (nth (1- (length position)) position))) + (setq position (nth (1- (length position)) position))) + ((and (stringp (car position)) + (null (cdr position))) + (setq position (car position)))) + (cond ((eq position nil) + position) + ((listp position) + (imenu--mouse-menu position event + (if title + (concat title imenu-level-separator + (car (rassq position index-alist))) + (car (rassq position index-alist))))) + ((stringp position) + (or (string= position (car imenu--rescan-item)) + (imenu--in-alist position index-alist))) + ((or (= position (cdr imenu--rescan-item)) + (and (stringp position) + (string= position (car imenu--rescan-item)))) + t) + (t + (rassq position index-alist))))) (defun imenu-choose-buffer-index (&optional prompt alist) "Let the user select from a buffer index and return the chosen index. |