* emacs.c (Fdaemonp): Doc fix.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4039e582ebe3511cd8e5768f9a3e6e3bdfc4fbd7..c53dd35e2d2c944f247e0b285e7f2eac29d3e625 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,10 @@
+2008-09-22  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs.c (Fdaemonp): Doc fix.
+
 2008-09-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
-       * emacs.c (main): Place #ifdef.in the proper place.
+       * emacs.c (main): Place #ifdef in the proper place.
 
 2008-09-21  Dan Nicolaescu  <dann@ics.uci.edu>
 

diff --git a/src/emacs.c b/src/emacs.c
index af4a6924240c98eea060845a114d903a79bf1fd5..f94d2d39ae4cfaca93ecb1e1868475116085c437 100644 (file)
--- 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;
 }