(Fwhere_is_internal): Ignore `menu-bar' and `tool-bar'.

(where_is_internal_1): Don't bother ignoring menu-items any more.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4277f5fd45bda6f36ea9f15ae07276aab8d0d12a..40b21ea1a260a16bc01b60825c2f83b406cb6e40 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-04  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * keymap.c (Fwhere_is_internal): Ignore `menu-bar' and `tool-bar'.
+       (where_is_internal_1): Don't bother ignoring menu-items any more.
+
 2000-10-04  Gerd Moellmann  <gerd@gnu.org>
 
        * keyboard.c (update_menu_bindings): New variable.

diff --git a/src/keymap.c b/src/keymap.c
index a9b659804cd332ef908d85a5685b3a24db19dddb..8921f53689b84baeb5a22880471b3dea6499055d 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2170,6 +2170,14 @@ indirect definition itself.")
       last_is_meta = (XINT (last) >= 0
                      && EQ (Faref (this, last), meta_prefix_char));
 
+      if (nomenus && XINT (last) >= 0)
+       { /* If no menu entries should be returned, skip over the
+            keymaps bound to `menu-bar' and `tool-bar'.  */
+         Lisp_Object tem = Faref (this, 0);
+         if (EQ (tem, Qmenu_bar) || EQ (tem, Qtool_bar))
+           continue;
+       }
+
       QUIT;
 
       while (CONSP (map))
@@ -2328,29 +2336,7 @@ where_is_internal_1 (binding, key, definition, noindirect, keymap, this, last,
 
   /* Search through indirections unless that's not wanted.  */
   if (NILP (noindirect))
-    {
-      if (nomenus)
-       {
-         while (1)
-           {
-             Lisp_Object map, tem;
-             /* If the contents are (KEYMAP . ELEMENT), go indirect.  */
-             map = get_keymap_1 (Fcar_safe (definition), 0, 0);
-             tem = Fkeymapp (map);
-             if (!NILP (tem))
-               definition = access_keymap (map, Fcdr (definition), 0, 0);
-             else
-               break;
-           }
-         /* If the contents are (menu-item ...) or (STRING ...), reject.  */
-         if (CONSP (definition)
-             && (EQ (XCAR (definition),Qmenu_item)
-                 || STRINGP (XCAR (definition))))
-           return Qnil;
-       }
-      else
-       binding = get_keyelt (binding, 0);
-    }
+    binding = get_keyelt (binding, 0);
 
   /* End this iteration if this element does not match
      the target.  */