(init_display): Return earlier when running as a

daemon.

2 files changed, 9 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index aa372dd23df..b95ac6cf34f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/dispnew.c b/src/dispnew.c
index 0f8f174eb7c..307515f7bfb 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6824,6 +6824,10 @@ init_display ()
     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 @@ init_display ()
     }
 #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))
     {