From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 8 May 2015 09:11:05 +0000 (+0300)
Subject: Fix keyboard macros that include function keys
X-Git-Tag: emacs-25.0.90~2153
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d0a4d06efff115f35b4813fa7d2d68b2c600297;p=emacs.git

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)
---

diff --git a/src/keyboard.c b/src/keyboard.c
index c2739df10fa..77f7fb97898 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);