Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 241-257)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 59-65)

   - Update from CVS
   - Merge from emacs--cvs-trunk--0
   - (mm-string-to-multibyte): Use Gnus trunk definition.

1 files changed, 17 insertions, 2 deletions

diff --git a/src/keymap.c b/src/keymap.c
index 3aaecf1a5d7..3484186404a 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -739,7 +739,9 @@ usage: (map-keymap FUNCTION KEYMAP)  */)
    remove that.  Also remove a menu help string as second element.
 
    If AUTOLOAD is nonzero, load autoloadable keymaps
-   that are referred to with indirection.  */
+   that are referred to with indirection.
+
+   This can GC because menu_item_eval_property calls Feval.  */
 
 Lisp_Object
 get_keyelt (object, autoload)
@@ -2543,6 +2545,19 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap)
                 continue;
 
             record_sequence:
+              /* Don't annoy user with strings from a menu such as
+                 Select Paste.  Change them all to "(any string)",
+                 so that there seems to be only one menu item
+                 to report. */
+              if (! NILP (sequence))
+                {
+                  Lisp_Object tem;
+                  tem = Faref (sequence, make_number (XVECTOR (sequence)->size - 1));
+                  if (STRINGP (tem))
+                    Faset (sequence, make_number (XVECTOR (sequence)->size - 1),
+                           build_string ("(any string)"));
+                }
+
               /* It is a true unshadowed match.  Record it, unless it's already
                  been seen (as could happen when inheriting keymaps).  */
               if (NILP (Fmember (sequence, found)))
@@ -2750,7 +2765,7 @@ where_is_internal_2 (args, key, binding)
 }
 
 
-/* This function cannot GC.  */
+/* This function can GC because get_keyelt can.  */
 
 static Lisp_Object
 where_is_internal_1 (binding, key, definition, noindirect, this, last,