# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1222567106 0
# Node ID 7424f5df0da7f6febf38b936452f43b7fc810adf
# Parent  5c4f4a8f1821d57a54eac059d662e96fe0af8937
(init_display): Return earlier when running as a
daemon.

diff -r 5c4f4a8f1821 -r 7424f5df0da7 src/ChangeLog
--- a/src/ChangeLog	Sun Sep 28 00:36:00 2008 +0000
+++ b/src/ChangeLog	Sun Sep 28 01:58:26 2008 +0000
@@ -1,3 +1,8 @@
+2008-09-28  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* dispnew.c (init_display): Return earlier when running as a
+	daemon.
+
 2008-09-27  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
 	* nsfont.m (nsfont_draw): Fix up composition rendering (cmp_from,
diff -r 5c4f4a8f1821 -r 7424f5df0da7 src/dispnew.c
--- a/src/dispnew.c	Sun Sep 28 00:36:00 2008 +0000
+++ b/src/dispnew.c	Sun Sep 28 01:58:26 2008 +0000
@@ -6824,6 +6824,10 @@
     signal (SIGWINCH, window_change_signal);
 #endif /* SIGWINCH */
 
+  /* If running as a daemon, no need to initialize any frames/terminal. */
+  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
      terminal is so dumb that emacs gives up before and doesn't bother
@@ -6892,10 +6896,6 @@
     }
 #endif
 
-  /* If running as a daemon, no need to initialize any frames/terminal. */
-  if (is_daemon)
-    return;
-
   /* If no window system has been specified, try to use the terminal.  */
   if (! isatty (0))
     {