Commit fc18e547 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(Faccessible_keymaps): Pass `is_metized' to accessible_keymaps_char_table.

(accessible_keymaps_char_table): Obey `is_metized'.
(where_is_internal, Fwhere_is_internal): Don't confuse int and Lisp_Object.
parent f58c6494
...@@ -1537,7 +1537,7 @@ then the value includes only maps for prefixes that start with PREFIX.") ...@@ -1537,7 +1537,7 @@ then the value includes only maps for prefixes that start with PREFIX.")
Lisp_Object indices[3]; Lisp_Object indices[3];
map_char_table (accessible_keymaps_char_table, Qnil, map_char_table (accessible_keymaps_char_table, Qnil,
elt, Fcons (Fcons (maps, is_metized), elt, Fcons (Fcons (maps, make_number (is_metized)),
Fcons (tail, thisseq)), Fcons (tail, thisseq)),
0, indices); 0, indices);
} }
...@@ -1669,14 +1669,15 @@ accessible_keymaps_char_table (args, index, cmd) ...@@ -1669,14 +1669,15 @@ accessible_keymaps_char_table (args, index, cmd)
Lisp_Object args, index, cmd; Lisp_Object args, index, cmd;
{ {
Lisp_Object tem; Lisp_Object tem;
Lisp_Object maps, tail, thisseq, is_metized; Lisp_Object maps, tail, thisseq;
int is_metized;
cmd = get_keyelt (cmd, 0); cmd = get_keyelt (cmd, 0);
if (NILP (cmd)) if (NILP (cmd))
return; return;
maps = XCAR (XCAR (args)); maps = XCAR (XCAR (args));
is_metized = XCDR (XCAR (args)); is_metized = XINT (XCDR (XCAR (args)));
tail = XCAR (XCDR (args)); tail = XCAR (XCDR (args));
thisseq = XCDR (XCDR (args)); thisseq = XCDR (XCDR (args));
......
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