From 3cb98721e23030812206733f733d40a2ea523bc6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 17 Feb 2014 13:20:44 -0800 Subject: [PATCH] temacs --daemon fix * emacs.c (main): Initialize daemon_pipe[1] here ... (syms_of_emacs): ... instead of here. Fixes: debbugs:16599 --- src/ChangeLog | 6 ++++++ src/emacs.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 889efe86f74..8592eef6251 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2014-02-17 Paul Eggert + + temacs --daemon fix (Bug#16599). + * emacs.c (main): Initialize daemon_pipe[1] here ... + (syms_of_emacs): ... instead of here. + 2014-02-16 Anders Lindgern * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask diff --git a/src/emacs.c b/src/emacs.c index 18f6a089dbb..fd93324de97 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1005,6 +1005,9 @@ main (int argc, char **argv) exit (0); } + /* Make sure IS_DAEMON starts up as false. */ + daemon_pipe[1] = 0; + if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args) || argmatch (argv, argc, "-daemon", "--daemon", 5, &dname_arg, &skip_args)) { @@ -2548,7 +2551,4 @@ libraries; only those already known by Emacs will be loaded. */); Vlibrary_cache = Qnil; staticpro (&Vlibrary_cache); #endif - - /* Make sure IS_DAEMON starts up as false. */ - daemon_pipe[1] = 0; } -- 2.39.2