andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(IS_DAEMON): Move definition ...
* lisp.h (IS_DAEMON): ... here.
(daemon_pipe): Declare.
(is_daemon): Remove.
* dispnew.c (init_display): Use IS_DAEMON.
This commit is contained in:
Dan Nicolaescu 2008-10-28 04:25:11 +00:00
parent 9fc10007e9
commit ff808935f5
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ChangeLog
View file

@ -1,3 +1,12 @@
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>
* xdisp.c (pos_visible_p, redisplay_internal, message3_nolog)

4
src/dispnew.c
View file

@ -6843,8 +6843,8 @@ init_display ()
#endif /* SIGWINCH */
/* If running as a daemon, no need to initialize any frames/terminal. */
if (is_daemon)
return;
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

4
src/emacs.c
View file

@ -240,9 +240,7 @@ static char *daemon_name;
/* Pipe used to send exit notification to the daemon parent at
startup. */
static int daemon_pipe[2];
#define IS_DAEMON (daemon_pipe[1] != 0)
int daemon_pipe[2];
/* Save argv and argc. */
char **initial_argv;

8
src/lisp.h
View file

@ -3118,8 +3118,12 @@ 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;
/* 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 */
extern int inhibit_window_system;
/* Nonzero means that a filter or a sentinel is running. */