Mercurial > emacs

comparison 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
comparison
equal deleted inserted replaced
83514:d9f8d2a65d18 83515:f7a396df2380
521 /* If we're in another window, cancel the minibuffer that's active. */ 521 /* If we're in another window, cancel the minibuffer that's active. */
522 Fthrow (Qexit, 522 Fthrow (Qexit,
523 build_string ("Command attempted to use minibuffer while in minibuffer")); 523 build_string ("Command attempted to use minibuffer while in minibuffer"));
524 } 524 }
525 525
526 if (noninteractive) 526 if (noninteractive && NILP (Vexecuting_kbd_macro))
527 { 527 {
528 val = read_minibuf_noninteractive (map, initial, prompt, 528 val = read_minibuf_noninteractive (map, initial, prompt,
529 make_number (pos), 529 make_number (pos),
530 expflag, histvar, histpos, defalt, 530 expflag, histvar, histpos, defalt,
531 allow_props, inherit_input_method); 531 allow_props, inherit_input_method);