# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 834427850 0
# Node ID 6b1faae68eba96ea4d390eb5ea33dc1c029bd2bd
# Parent  76072cbcae84c2e788c2b77becd4a4cced58c596
(imenu--mouse-menu): Always use nested keymaps.
(imenu-use-keymap-menu): Variable deleted.

diff -r 76072cbcae84 -r 6b1faae68eba lisp/imenu.el
--- a/lisp/imenu.el	Mon Jun 10 17:00:06 1996 +0000
+++ b/lisp/imenu.el	Mon Jun 10 17:30:50 1996 +0000
@@ -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 @@
 		   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