[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog keyboard.c
From: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] emacs/src ChangeLog keyboard.c |
Date: |
Thu, 04 Dec 2008 08:53:29 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/12/04 08:53:29
Modified files:
src : ChangeLog keyboard.c
Log message:
(kbd_buffer_get_event): 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.7163&r2=1.7164
http://cvs.savannah.gnu.org/viewcvs/emacs/src/keyboard.c?cvsroot=emacs&r1=1.982&r2=1.983
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7163
retrieving revision 1.7164
diff -u -b -r1.7163 -r1.7164
--- ChangeLog 3 Dec 2008 14:16:27 -0000 1.7163
+++ ChangeLog 4 Dec 2008 08:53:26 -0000 1.7164
@@ -1,3 +1,8 @@
+2008-12-04 Dan Nicolaescu <address@hidden>
+
+ * keyboard.c (kbd_buffer_get_event): Follow the non-interactive
+ case when running as a daemon before detaching.
+
2008-12-03 Juanma Barranquero <address@hidden>
* w32.c (init_environment): Don't unload library shell32.dll.
Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.982
retrieving revision 1.983
diff -u -b -r1.982 -r1.983
--- keyboard.c 3 Dec 2008 02:40:29 -0000 1.982
+++ keyboard.c 4 Dec 2008 08:53:28 -0000 1.983
@@ -3978,7 +3978,10 @@
register int c;
Lisp_Object obj;
- if (noninteractive)
+ if (noninteractive
+ /* In case we are running as a daemon, only do this before
+ detaching from the terminal. */
+ || (IS_DAEMON && daemon_pipe[1] >= 0))
{
c = getchar ();
XSETINT (obj, c);
- [Emacs-diffs] emacs/src ChangeLog keyboard.c,
Dan Nicolaescu <=