(read_minibuf): Don't use read_minibuf_noninteractive

when inside a keyboard macro.

diff --git a/src/ChangeLog b/src/ChangeLog
index bf52364ee662d5445f155c0a446c2e262033b704..ed67de1f5d18b2bef6662d1fee092cb0a47e0d24 100644 (file)
--- 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 5dbef8c3f08b1068a6ca2c9c89c28e92b4dbba7a..e994707989235654b5a5715f87258c1a4d2082de 100644 (file)
--- 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),