[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 0d0a4d0: Fix keyboard macros that include function
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master 0d0a4d0: Fix keyboard macros that include function keys |
Date: |
Fri, 08 May 2015 09:14:58 +0000 |
branch: master
commit 0d0a4d06efff115f35b4813fa7d2d68b2c600297
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix keyboard macros that include function keys
* src/keyboard.c (read_char_minibuf_menu_prompt): Record function
keys in the macro before returning. (Bug#20454)
---
src/keyboard.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index c2739df..77f7fb9 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8707,12 +8707,10 @@ read_char_minibuf_menu_prompt (int commandflag,
while (BUFFERP (obj));
kset_defining_kbd_macro (current_kboard, orig_defn_macro);
- if (!INTEGERP (obj) || XINT (obj) == -2)
- return obj;
-
- if (! EQ (obj, menu_prompt_more_char)
- && (!INTEGERP (menu_prompt_more_char)
- || ! EQ (obj, make_number (Ctl (XINT (menu_prompt_more_char))))))
+ if (!INTEGERP (obj) || XINT (obj) == -2
+ || (! EQ (obj, menu_prompt_more_char)
+ && (!INTEGERP (menu_prompt_more_char)
+ || ! EQ (obj, make_number (Ctl (XINT
(menu_prompt_more_char)))))))
{
if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
store_kbd_macro_char (obj);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 0d0a4d0: Fix keyboard macros that include function keys,
Eli Zaretskii <=