Mercurial > emacs

diff src/minibuf.c @ 83515:f7a396df2380

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-263 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-264 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-265 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/gnus--rel--5.10--patch-99 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-100 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-555
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 05 May 2006 10:30:28 +0000
parents b98066f4aa10 ecf86801649d
children 1321f6cfb389
line wrap: on
line diff
--- a/src/minibuf.c	Wed May 03 11:56:53 2006 +0000
+++ b/src/minibuf.c	Fri May 05 10:30:28 2006 +0000
@@ -523,7 +523,7 @@
 		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),