(read_minibuf): Don't use read_minibuf_noninteractive

when inside a keyboard macro.

2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bf52364ee66..ed67de1f5d1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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.
diff --git a/src/minibuf.c b/src/minibuf.c
index 5dbef8c3f08..e9947079892 100644
--- 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),