From 9d0a6e42058de55024e17ba40a8e9bb48c162db8 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 22 Sep 2008 15:21:40 +0000 Subject: [PATCH] * emacs.c (Fdaemonp): Doc fix. --- src/ChangeLog | 6 +++++- src/emacs.c | 18 +++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 4039e582ebe..c53dd35e2d2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,10 @@ +2008-09-22 Juanma Barranquero + + * emacs.c (Fdaemonp): Doc fix. + 2008-09-22 Dan Nicolaescu - * emacs.c (main): Place #ifdef.in the proper place. + * emacs.c (main): Place #ifdef in the proper place. 2008-09-21 Dan Nicolaescu diff --git a/src/emacs.c b/src/emacs.c index af4a6924240..f94d2d39ae4 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1074,20 +1074,20 @@ main (int argc, char **argv) if (argmatch (argv, argc, "-daemon", "--daemon", 5, NULL, &skip_args)) { #ifndef DOS_NT - pid_t f = fork(); + pid_t f = fork (); int nfd; if (f > 0) - exit(0); + exit (0); if (f < 0) { fprintf (stderr, "Cannot fork!\n"); - exit(1); + exit (1); } - nfd = open("/dev/null", O_RDWR); - dup2(nfd, 0); - dup2(nfd, 1); - dup2(nfd, 2); + nfd = open ("/dev/null", O_RDWR); + dup2 (nfd, 0); + dup2 (nfd, 1); + dup2 (nfd, 2); close (nfd); is_daemon = 1; #ifdef HAVE_SETSID @@ -2383,8 +2383,8 @@ decode_env_path (evarname, defalt) } DEFUN ("daemonp", Fdaemonp, Sdaemonp, 0, 0, 0, - doc: /* Make the current emacs process a daemon.*/) - (void) + doc: /* Return t if the current emacs process is a daemon. */) + () { return is_daemon ? Qt : Qnil; } -- 2.39.5