diff options
| author | Stefan Monnier | 2001-02-26 17:16:00 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2001-02-26 17:16:00 +0000 |
| commit | fc18e5470d04b5315514ed8ef6a89a876f2f84bc (patch) | |
| tree | 72dde3190f5c2aa453fbe3a729ea089c2c8ff2e4 | |
| parent | f58c64946e68b9428c6276d7eda38d22a7d79d6c (diff) | |
| download | emacs-fc18e5470d04b5315514ed8ef6a89a876f2f84bc.tar.gz emacs-fc18e5470d04b5315514ed8ef6a89a876f2f84bc.zip | |
(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.
| -rw-r--r-- | src/keymap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c index c44cf09d5b9..e9e51c785de 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -1537,7 +1537,7 @@ then the value includes only maps for prefixes that start with PREFIX.") | |||
| 1537 | Lisp_Object indices[3]; | 1537 | Lisp_Object indices[3]; |
| 1538 | 1538 | ||
| 1539 | map_char_table (accessible_keymaps_char_table, Qnil, | 1539 | map_char_table (accessible_keymaps_char_table, Qnil, |
| 1540 | elt, Fcons (Fcons (maps, is_metized), | 1540 | elt, Fcons (Fcons (maps, make_number (is_metized)), |
| 1541 | Fcons (tail, thisseq)), | 1541 | Fcons (tail, thisseq)), |
| 1542 | 0, indices); | 1542 | 0, indices); |
| 1543 | } | 1543 | } |
| @@ -1669,14 +1669,15 @@ accessible_keymaps_char_table (args, index, cmd) | |||
| 1669 | Lisp_Object args, index, cmd; | 1669 | Lisp_Object args, index, cmd; |
| 1670 | { | 1670 | { |
| 1671 | Lisp_Object tem; | 1671 | Lisp_Object tem; |
| 1672 | Lisp_Object maps, tail, thisseq, is_metized; | 1672 | Lisp_Object maps, tail, thisseq; |
| 1673 | int is_metized; | ||
| 1673 | 1674 | ||
| 1674 | cmd = get_keyelt (cmd, 0); | 1675 | cmd = get_keyelt (cmd, 0); |
| 1675 | if (NILP (cmd)) | 1676 | if (NILP (cmd)) |
| 1676 | return; | 1677 | return; |
| 1677 | 1678 | ||
| 1678 | maps = XCAR (XCAR (args)); | 1679 | maps = XCAR (XCAR (args)); |
| 1679 | is_metized = XCDR (XCAR (args)); | 1680 | is_metized = XINT (XCDR (XCAR (args))); |
| 1680 | tail = XCAR (XCDR (args)); | 1681 | tail = XCAR (XCDR (args)); |
| 1681 | thisseq = XCDR (XCDR (args)); | 1682 | thisseq = XCDR (XCDR (args)); |
| 1682 | 1683 | ||