diff options
| author | Dan Nicolaescu <[email protected]> | 2008-09-24 19:58:06 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2008-09-24 19:58:06 +0000 |
| commit | 73fee52267dfcaf79217c0476eab4c421f5b7702 (patch) | |
| tree | 1981656fbd291c7dadaea612293f8e0a2f597682 /src | |
| parent | 92d2ea2ce739d0d9ee5b09a39bb5efe46b8d471b (diff) | |
* lisp.h (is_daemon): Declare.
* dispnew.c (init_display): Do not try to initialize the terminal
when running as a daemon.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/dispnew.c | 4 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f2b82b231b..b0689ee9c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2008-09-24 Dan Nicolaescu <[email protected]> + + * 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 <[email protected]> * nsfns.m (compute_tip_xy): Use x_display_pixel_width and diff --git a/src/dispnew.c b/src/dispnew.c index 48a8bd283c..0f8f174eb7 100644 --- 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 d013a04553..268d5b64ee 100644 --- 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. */ |