diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-07-26 14:02:53 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-07-26 14:02:53 -0600 |
| commit | cc231cbe45d27a1906d268fb72d3b4105a2e9c65 (patch) | |
| tree | c011828e2a3a18e77eaa8849e3cccb805d798f42 /src/emacs.c | |
| parent | b34a529f177a6ea32da5cb1254f91bf9d71838db (diff) | |
| parent | fec9206062b420aca84f53d05a72c3ee43244022 (diff) | |
| download | emacs-cc231cbe45d27a1906d268fb72d3b4105a2e9c65.tar.gz | |
merge from trunk
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/emacs.c b/src/emacs.c index 274321482e1..6d406407a9d 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -974,7 +974,7 @@ main (int argc, char **argv) use a pipe for synchronization. The parent waits for the child to close its end of the pipe (using `daemon-initialized') before exiting. */ - if (pipe2 (daemon_pipe, O_CLOEXEC) != 0) + if (emacs_pipe (daemon_pipe) != 0) { fprintf (stderr, "Cannot pipe!\n"); exit (1); @@ -1494,12 +1494,11 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem char *file; /* Handle -l loadup, args passed by Makefile. */ if (argmatch (argv, argc, "-l", "--load", 3, &file, &skip_args)) - Vtop_level = Fcons (intern_c_string ("load"), - Fcons (build_string (file), Qnil)); + Vtop_level = list2 (intern_c_string ("load"), build_string (file)); /* Unless next switch is -nl, load "loadup.el" first thing. */ if (! no_loadup) - Vtop_level = Fcons (intern_c_string ("load"), - Fcons (build_string ("loadup.el"), Qnil)); + Vtop_level = list2 (intern_c_string ("load"), + build_string ("loadup.el")); } if (initialized) |