* emacs.c (daemon_pipe): Make non-static.

(IS_DAEMON): Move definition ...
* lisp.h (IS_DAEMON): ... here.
(daemon_pipe): Declare.
(is_daemon): Remove.
* dispnew.c (init_display): Use IS_DAEMON.

4 files changed, 18 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ba79e504b53..1c1c6aa5b74 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * emacs.c (daemon_pipe): Make non-static.
+        (IS_DAEMON): Move definition ...
+        * lisp.h (IS_DAEMON): ... here.
+        (daemon_pipe): Declare.
+        (is_daemon): Remove.
+        * dispnew.c (init_display): Use IS_DAEMON.
+
 2008-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xdisp.c (pos_visible_p, redisplay_internal, message3_nolog)
diff --git a/src/dispnew.c b/src/dispnew.c
index 9c810a53e69..60caaa091eb 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6843,8 +6843,8 @@ init_display ()
 #endif /* SIGWINCH */
 
   /* If running as a daemon, no need to initialize any frames/terminal. */
-  if (is_daemon)
-    return;
+  if (IS_DAEMON)
+      return;
 
   /* If the user wants to use a window system, we shouldn't bother
      initializing the terminal.  This is especially important when the
diff --git a/src/emacs.c b/src/emacs.c
index b3dee7776a2..d707f4f758d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -240,9 +240,7 @@ static char *daemon_name;
 
 /* Pipe used to send exit notification to the daemon parent at
    startup.  */
-static int daemon_pipe[2];
-
-#define IS_DAEMON (daemon_pipe[1] != 0)
+int daemon_pipe[2];
 
 /* Save argv and argc.  */
 char **initial_argv;
diff --git a/src/lisp.h b/src/lisp.h
index df7f9669175..bffdfba020d 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3118,8 +3118,12 @@ void synchronize_system_time_locale P_ ((void));
 void shut_down_emacs P_ ((int, int, Lisp_Object));
 /* Nonzero means don't do interactive redisplay and don't change tty modes */
 extern int noninteractive;
-/* Nonzero means Emacs was started as a daemon.  */
-extern int is_daemon;
+
+/* Pipe used to send exit notification to the daemon parent at
+   startup.  */
+extern int daemon_pipe[2];
+#define IS_DAEMON (daemon_pipe[1] != 0)
+
 /* Nonzero means don't do use window-system-specific display code */
 extern int inhibit_window_system;
 /* Nonzero means that a filter or a sentinel is running.  */