(read_minibuf): Don't use read_minibuf_noninteractive

when inside a keyboard macro.

(read_minibuf): Don't use read_minibuf_noninteractive
when inside a keyboard macro.
8b0ba111 · Richard M. Stallman · 5719a99d · 8b0ba111 · 8b0ba111
Commit 8b0ba111 authored May 03, 2006 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

src/ChangeLog src/ChangeLog +5 -0

src/minibuf.c src/minibuf.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2006-05-03  Richard Stallman  <rms@gnu.org>
+
+	* minibuf.c (read_minibuf): Don't use read_minibuf_noninteractive
+	when inside a keyboard macro.
+
 2006-05-02  Andreas Schwab  <schwab@suse.de>
  
 	* xmenu.c (restore_menu_items): Return a value.

--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -523,7 +523,7 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
 		build_string ("Command attempted to use minibuffer while in minibuffer"));
    }

-  if (noninteractive)
+  if (noninteractive && NILP (Vexecuting_kbd_macro))
    {
      val = read_minibuf_noninteractive (map, initial, prompt,
 					 make_number (pos),