[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog minibuf.c
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] emacs/src ChangeLog minibuf.c |
Date: |
Mon, 22 Dec 2008 20:45:56 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/12/22 20:45:56
Modified files:
src : ChangeLog minibuf.c
Log message:
(read_minibuf): Follow the non-interactive case when
running as a daemon, before detaching.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7223&r2=1.7224
http://cvs.savannah.gnu.org/viewcvs/emacs/src/minibuf.c?cvsroot=emacs&r1=1.359&r2=1.360
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7223
retrieving revision 1.7224
diff -u -b -r1.7223 -r1.7224
--- ChangeLog 22 Dec 2008 09:48:21 -0000 1.7223
+++ ChangeLog 22 Dec 2008 20:45:52 -0000 1.7224
@@ -1,3 +1,8 @@
+2008-12-22 Dan Nicolaescu <address@hidden>
+
+ * minibuf.c (read_minibuf): Follow the non-interactive case when
+ running as a daemon, before detaching.
+
2008-12-22 Andreas Schwab <address@hidden>
* buffer.c (init_buffer): Use realloc instead of xrealloc.
Index: minibuf.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/minibuf.c,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -b -r1.359 -r1.360
--- minibuf.c 20 Dec 2008 10:25:19 -0000 1.359
+++ minibuf.c 22 Dec 2008 20:45:56 -0000 1.360
@@ -525,7 +525,11 @@
build_string ("Command attempted to use minibuffer while in
minibuffer"));
}
- if (noninteractive && NILP (Vexecuting_kbd_macro))
+ if ((noninteractive
+ /* In case we are running as a daemon, only do this before
+ detaching from the terminal. */
+ || (IS_DAEMON && (daemon_pipe[1] >= 0)))
+ && NILP (Vexecuting_kbd_macro))
{
val = read_minibuf_noninteractive (map, initial, prompt,
make_number (pos),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog minibuf.c,
Dan Nicolaescu <=