mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Code Issues Releases Activity

* keymap.c (Fkey_binding): Use string position for string objects.

Browse Source
This commit is contained in:
Chong Yidong 2006-09-11 13:03:40 +00:00
parent e027c6e48d
commit 91197db4cb
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,3 +1,7 @@
2006-09-11 Chong Yidong <cyd@stupidchicken.com>
* keymap.c (Fkey_binding): Use string position for string objects.
2006-09-11 Kim F. Storm <storm@cua.dk> 2006-09-11 Kim F. Storm <storm@cua.dk>
* keymap.c (Fkey_binding): Fix last change. * keymap.c (Fkey_binding): Fix last change.

17
src/keymap.c
View File

@ -1587,13 +1587,16 @@ is non-nil, `key-binding' returns the unmapped command. */)
&& XINT (Flength (pos)) == 10 && XINT (Flength (pos)) == 10
&& INTEGERP (XCAR (XCDR (pos)))) && INTEGERP (XCAR (XCDR (pos))))
{ {
Lisp_Object map, obj; Lisp_Object map, object;
obj = Fnth (make_number(4), pos);
map = Fget_char_property (XCAR (XCDR (pos)), object = Fnth (make_number(4), pos);
Qkeymap,
NILP (obj) ? if (CONSP (object))
Fwindow_buffer (XCAR (pos)) map = Fget_char_property (XCDR (object), Qkeymap, XCAR (object));
: XCAR (obj)); else
map = Fget_char_property (XCAR (XCDR (pos)), Qkeymap,
Fwindow_buffer (XCAR (pos)));
if (!NILP (Fkeymapp (map))) if (!NILP (Fkeymapp (map)))
{ {
value = Flookup_key (map, key, accept_default); value = Flookup_key (map, key, accept_default);