[Emacs-diffs] trunk r116465: temacs --daemon fix

[Paul Eggert]

------------------------------------------------------------
revno: 116465
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16599
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2014-02-17 13:20:44 -0800
message:
  temacs --daemon fix
  
  * emacs.c (main): Initialize daemon_pipe[1] here ...
  (syms_of_emacs): ... instead of here.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-16 09:51:41 +0000
+++ b/src/ChangeLog     2014-02-17 21:20:44 +0000
@@ -1,3 +1,9 @@
+2014-02-17  Paul Eggert  <address@hidden>
+
+       temacs --daemon fix (Bug#16599).
+       * emacs.c (main): Initialize daemon_pipe[1] here ...
+       (syms_of_emacs): ... instead of here.
+
 2014-02-16  Anders Lindgern <address@hidden>
 
        * nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2014-01-20 19:44:56 +0000
+++ b/src/emacs.c       2014-02-17 21:20:44 +0000
@@ -1005,6 +1005,9 @@
       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 @@
   Vlibrary_cache = Qnil;
   staticpro (&Vlibrary_cache);
 #endif
-
-  /* Make sure IS_DAEMON starts up as false.  */
-  daemon_pipe[1] = 0;
 }