# HG changeset patch # User Richard M. Stallman # Date 834591648 0 # Node ID 9691904c57a5baf9c06f998dff6b8e7283bf5390 # Parent 559d91fe836ac3d457254faef273f704cc0bee25 (imenu--mouse-menu): Don't check imenu-use-keymap-menu. diff -r 559d91fe836a -r 9691904c57a5 lisp/imenu.el --- a/lisp/imenu.el Wed Jun 12 14:43:51 1996 +0000 +++ b/lisp/imenu.el Wed Jun 12 15:00:48 1996 +0000 @@ -712,34 +712,30 @@ (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.