# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1225167911 0
# Node ID c1511154e8c254af9ebdc60c8159319d4fa71cd5
# Parent  1da73cbe8b820d70f937ae72f59ddd0673360f98
* 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.

diff -r 1da73cbe8b82 -r c1511154e8c2 src/ChangeLog
--- a/src/ChangeLog	Tue Oct 28 02:57:25 2008 +0000
+++ b/src/ChangeLog	Tue Oct 28 04:25:11 2008 +0000
@@ -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 -r 1da73cbe8b82 -r c1511154e8c2 src/dispnew.c
--- a/src/dispnew.c	Tue Oct 28 02:57:25 2008 +0000
+++ b/src/dispnew.c	Tue Oct 28 04:25:11 2008 +0000
@@ -6843,8 +6843,8 @@
 #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 -r 1da73cbe8b82 -r c1511154e8c2 src/emacs.c
--- a/src/emacs.c	Tue Oct 28 02:57:25 2008 +0000
+++ b/src/emacs.c	Tue Oct 28 04:25:11 2008 +0000
@@ -240,9 +240,7 @@
 
 /* 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 -r 1da73cbe8b82 -r c1511154e8c2 src/lisp.h
--- a/src/lisp.h	Tue Oct 28 02:57:25 2008 +0000
+++ b/src/lisp.h	Tue Oct 28 04:25:11 2008 +0000
@@ -3118,8 +3118,12 @@
 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.  */