Commit 73fee522 authored by Dan Nicolaescu's avatar Dan Nicolaescu
Browse files

* lisp.h (is_daemon): Declare.

* dispnew.c (init_display): Do not try to initialize the terminal
when running as a daemon.
parent 92d2ea2c
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> 2008-09-22 Chong Yidong <cyd@stupidchicken.com>
   
* nsfns.m (compute_tip_xy): Use x_display_pixel_width and * nsfns.m (compute_tip_xy): Use x_display_pixel_width and
......
...@@ -6892,6 +6892,10 @@ init_display () ...@@ -6892,6 +6892,10 @@ init_display ()
} }
#endif #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 no window system has been specified, try to use the terminal. */
if (! isatty (0)) if (! isatty (0))
{ {
......
...@@ -3118,6 +3118,8 @@ void synchronize_system_time_locale P_ ((void)); ...@@ -3118,6 +3118,8 @@ void synchronize_system_time_locale P_ ((void));
void shut_down_emacs P_ ((int, int, Lisp_Object)); void shut_down_emacs P_ ((int, int, Lisp_Object));
/* Nonzero means don't do interactive redisplay and don't change tty modes */ /* Nonzero means don't do interactive redisplay and don't change tty modes */
extern int noninteractive; 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 */ /* Nonzero means don't do use window-system-specific display code */
extern int inhibit_window_system; extern int inhibit_window_system;
/* Nonzero means that a filter or a sentinel is running. */ /* Nonzero means that a filter or a sentinel is running. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment