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 c2739df10faa882cf6c7071936226a99471e95ef..77f7fb9789843704d6c96813e938f2d3a20e453d 100644 (file)
--- 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);