Commit 18e2d91f authored by Richard M. Stallman's avatar Richard M. Stallman

(where_is_internal): Convert a string used as event type into "(any string)".

parent 3f4ae3e4
2005-04-09 Richard M. Stallman <rms@gnu.org>
* keymap.c (where_is_internal): Convert a string used as event type
into "(any string)".
* lread.c (Vloads_in_progress): Not static.
* fns.c (Vloads_in_progress): Add extern.
(Frequire): Don't do LOADHIST_ATTACH if Vloads_in_progress is nil.
2005-04-09 Thien-Thi Nguyen <ttn@surf.glug.org>
* dispnew.c (mirror_line_dance): Avoid crash if W2 is null.
2005-04-09 Lute Kamstra <lute@gnu.org> 2005-04-09 Lute Kamstra <lute@gnu.org>
* print.c (PRINTPREPARE): Check if the marker PRINTCHARFUN is * print.c (PRINTPREPARE): Check if the marker PRINTCHARFUN is
......
...@@ -764,7 +764,9 @@ usage: (map-keymap FUNCTION KEYMAP) */) ...@@ -764,7 +764,9 @@ usage: (map-keymap FUNCTION KEYMAP) */)
remove that. Also remove a menu help string as second element. remove that. Also remove a menu help string as second element.
If AUTOLOAD is nonzero, load autoloadable keymaps 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 Lisp_Object
get_keyelt (object, autoload) get_keyelt (object, autoload)
...@@ -2554,6 +2556,19 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap) ...@@ -2554,6 +2556,19 @@ where_is_internal (definition, keymaps, firstonly, noindirect, no_remap)
continue; continue;
record_sequence: 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 /* It is a true unshadowed match. Record it, unless it's already
been seen (as could happen when inheriting keymaps). */ been seen (as could happen when inheriting keymaps). */
if (NILP (Fmember (sequence, found))) if (NILP (Fmember (sequence, found)))
...@@ -2731,7 +2746,7 @@ where_is_internal_2 (args, key, binding) ...@@ -2731,7 +2746,7 @@ where_is_internal_2 (args, key, binding)
} }
/* This function cannot GC. */ /* This function can GC because get_keyelt can. */
static Lisp_Object static Lisp_Object
where_is_internal_1 (binding, key, definition, noindirect, this, last, where_is_internal_1 (binding, key, definition, noindirect, this, last,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment