diff options
| author | Joakim Verona | 2013-02-15 00:04:11 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-02-15 00:04:11 +0100 |
| commit | 73b3f91cfcc9b42d2851ced24d7ba3d17e4c6d00 (patch) | |
| tree | dc111557cc7492ec9cd6dbfec4db2772ee4121b9 /src/keyboard.c | |
| parent | 694d759a9dd8fcbd23078bab33f84ff399d58971 (diff) | |
| parent | 51b3a99c948dc83f3387f440702ab6e175b61e0f (diff) | |
| download | emacs-73b3f91cfcc9b42d2851ced24d7ba3d17e4c6d00.tar.gz emacs-73b3f91cfcc9b42d2851ced24d7ba3d17e4c6d00.zip | |
auto upstream
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 3e1a6ba3346..5cd7e8473d2 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -8663,7 +8663,8 @@ follow_key (Lisp_Object keymap, Lisp_Object key) | |||
| 8663 | static Lisp_Object | 8663 | static Lisp_Object |
| 8664 | active_maps (Lisp_Object first_event) | 8664 | active_maps (Lisp_Object first_event) |
| 8665 | { | 8665 | { |
| 8666 | Lisp_Object position = INTEGERP (first_event) ? Qnil : first_event; | 8666 | Lisp_Object position |
| 8667 | = CONSP (first_event) ? CAR_SAFE (XCDR (first_event)) : Qnil; | ||
| 8667 | return Fcons (Qkeymap, Fcurrent_active_maps (Qt, position)); | 8668 | return Fcons (Qkeymap, Fcurrent_active_maps (Qt, position)); |
| 8668 | } | 8669 | } |
| 8669 | 8670 | ||