procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

temacs --daemon fix

Browse source 
* emacs.c (main): Initialize daemon_pipe[1] here ...
(syms_of_emacs): ... instead of here.

Fixes: debbugs:16599
This commit is contained in:
Paul Eggert 2014-02-17 13:20:44 -08:00
parent f260162808
commit 3cb98721e2
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
2014-02-17 Paul Eggert <eggert@cs.ucla.edu>
temacs --daemon fix (Bug#16599).
* emacs.c (main): Initialize daemon_pipe[1] here ...
(syms_of_emacs): ... instead of here.
2014-02-16 Anders Lindgern <andlind@gmail.com>
* nsterm.m (keyDown:): Check for normal key even if NSNumericPadKeyMask

6
src/emacs.c
View file

@ -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;
}