Commit ff808935 authored by Dan Nicolaescu's avatar Dan Nicolaescu

* emacs.c (daemon_pipe): Make non-static.

(IS_DAEMON): Move definition ...
* lisp.h (IS_DAEMON): ... here.
(daemon_pipe): Declare.
(is_daemon): Remove.
* dispnew.c (init_display): Use IS_DAEMON.
parent 9fc10007
2008-10-28 Dan Nicolaescu <dann@ics.uci.edu>
* emacs.c (daemon_pipe): Make non-static.
(IS_DAEMON): Move definition ...
* lisp.h (IS_DAEMON): ... here.
(daemon_pipe): Declare.
(is_daemon): Remove.
* dispnew.c (init_display): Use IS_DAEMON.
2008-10-28 Stefan Monnier <monnier@iro.umontreal.ca> 2008-10-28 Stefan Monnier <monnier@iro.umontreal.ca>
* xdisp.c (pos_visible_p, redisplay_internal, message3_nolog) * xdisp.c (pos_visible_p, redisplay_internal, message3_nolog)
......
...@@ -6843,8 +6843,8 @@ init_display () ...@@ -6843,8 +6843,8 @@ init_display ()
#endif /* SIGWINCH */ #endif /* SIGWINCH */
/* If running as a daemon, no need to initialize any frames/terminal. */ /* If running as a daemon, no need to initialize any frames/terminal. */
if (is_daemon) if (IS_DAEMON)
return; return;
/* If the user wants to use a window system, we shouldn't bother /* If the user wants to use a window system, we shouldn't bother
initializing the terminal. This is especially important when the initializing the terminal. This is especially important when the
......
...@@ -240,9 +240,7 @@ static char *daemon_name; ...@@ -240,9 +240,7 @@ static char *daemon_name;
/* Pipe used to send exit notification to the daemon parent at /* Pipe used to send exit notification to the daemon parent at
startup. */ startup. */
static int daemon_pipe[2]; int daemon_pipe[2];
#define IS_DAEMON (daemon_pipe[1] != 0)
/* Save argv and argc. */ /* Save argv and argc. */
char **initial_argv; char **initial_argv;
......
...@@ -3118,8 +3118,12 @@ void synchronize_system_time_locale P_ ((void)); ...@@ -3118,8 +3118,12 @@ 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; /* Pipe used to send exit notification to the daemon parent at
startup. */
extern int daemon_pipe[2];
#define IS_DAEMON (daemon_pipe[1] != 0)
/* 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