(imenu--create-keymap-2): Revert use of menu-item for

now, to avoid problems with binding imenu directly to a mouse event.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4df346b527a42621812aeb0b5ace8441a79fe229..cfb41f804dfb2ad967b56eecf3a91c86dcf52834 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-07  Dave Love  <fx@gnu.org>
+
+       * imenu.el (imenu--create-keymap-2): Revert use of menu-item for
+       now, to avoid problems with binding imenu directly to a mouse event.
+
 2001-03-07  Gerd Moellmann  <gerd@gnu.org>
 
        * info.el (Info-scroll-down): Call pos-visible-in-window-p with

diff --git a/lisp/imenu.el b/lisp/imenu.el
index 440758693e8681dabddf491a172bf879ad54faff..b799c68c6e2a09572b174664184416d83383d062 100644 (file)
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -646,7 +646,13 @@ as a way for the user to ask to recalculate the buffer's index alist."
                                    (imenu--menubar-select ',item))
                      (cons '(nil) item))))
           (cons (car item)
-                (list 'menu-item (car item) end :key-sequence nil))))))
+                (cons (car item) end)
+                ;; Fixme: Using this (to speded up menus), instead of
+                ;; the line above, breaks the case where `imenu' is
+                ;; bound to a mouse key.  The code in imenu needs
+                ;; fixing somehow to cope.
+                ;; (list 'menu-item (car item) end :key-sequence nil)
+                )))))
      alist)))
 
 ;; If COMMANDS is non-nil, make a real keymap
@@ -1075,6 +1081,8 @@ for more information."
   (and index-item
        (progn
         (push-mark)
+        ;; Fixme: sort this out so that we can use menu-item with
+        ;; :key-sequence in imenu--create-keymap-2.
         (let* ((is-special-item (listp (cdr index-item)))
                (function
                 (if is-special-item