diff options
| author | Adrian Robert | 2009-09-18 21:12:09 +0000 |
|---|---|---|
| committer | Adrian Robert | 2009-09-18 21:12:09 +0000 |
| commit | cff111562706d45e70ee6921e1cc3fdfaf9daa87 (patch) | |
| tree | 9da8c8300deedaf964c53cdd027dd2fcc7dec51f /src | |
| parent | f9245b5d0fd9b7c57e10b15aa3417922fc5bdc22 (diff) | |
| download | emacs-cff111562706d45e70ee6921e1cc3fdfaf9daa87.tar.gz emacs-cff111562706d45e70ee6921e1cc3fdfaf9daa87.zip | |
* emacs.c (main) [HAVE_NS]: fix error printf in daemon case.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/emacs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b7dd673f390..c40dc4cfdf4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * emacs.c (inhibit_x_resources): Update doc string for NS. | 3 | * emacs.c (inhibit_x_resources): Update doc string for NS. |
| 4 | (main) [HAVE_NS]: Don't process --no-init-file option. Remove | 4 | (main) [HAVE_NS]: Don't process --no-init-file option. Remove |
| 5 | legacy code for -NXHost. | 5 | legacy code for -NXHost. Fix error printf in daemon case. |
| 6 | 6 | ||
| 7 | * nsterm.h (ns_no_defaults): Remove. | 7 | * nsterm.h (ns_no_defaults): Remove. |
| 8 | 8 | ||
diff --git a/src/emacs.c b/src/emacs.c index 8374a32669d..1afcd08fb68 100644 --- a/src/emacs.c +++ b/src/emacs.c | |||
| @@ -1180,7 +1180,7 @@ main (int argc, char **argv) | |||
| 1180 | argv[skip_args] = fdStr; | 1180 | argv[skip_args] = fdStr; |
| 1181 | 1181 | ||
| 1182 | execv (argv[0], argv); | 1182 | execv (argv[0], argv); |
| 1183 | fprintf (stderr, "emacs daemon: exec failed: %d\t%d\n", errno); | 1183 | fprintf (stderr, "emacs daemon: exec failed: %d\n", errno); |
| 1184 | exit (1); | 1184 | exit (1); |
| 1185 | } | 1185 | } |
| 1186 | 1186 | ||