* lisp.h (is_daemon): Declare.

* dispnew.c (init_display): Do not try to initialize the terminal
when running as a daemon.

diff --git a/src/ChangeLog b/src/ChangeLog
index f2b82b231bf555472baecc6af0b6a7aa5eeefd73..b0689ee9c8917e24d55bcb19549955b08ce9b12d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * lisp.h (is_daemon): Declare.
+       * dispnew.c (init_display): Do not try to initialize the terminal
+       when running as a daemon.
+
 2008-09-22  Chong Yidong  <cyd@stupidchicken.com>
 
        * nsfns.m (compute_tip_xy): Use x_display_pixel_width and

diff --git a/src/dispnew.c b/src/dispnew.c
index 48a8bd283c3cc8dbe40a09c7827d917ff542bc94..0f8f174eb7c4c47a2d188c44e796be33a3ffdb43 100644 (file)
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6892,6 +6892,10 @@ 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))
     {

diff --git a/src/lisp.h b/src/lisp.h
index d013a04553ec709523eb8490c414312b5d14d2f6..268d5b64eea920492d4b0c8ff571704714292fe0 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3118,6 +3118,8 @@ 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;
 /* 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.  */