mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-02 08:22:22 +00:00
Code Issues Releases Activity

* xsmfns.c: Initialize ice_fd.

Browse Source 
* xterm.c (x_term_init): Don't call x_session_initialize if running
as a daemon.

Fixes: debbugs:18375
This commit is contained in:
Jan Djärv 2014-09-04 07:38:37 +02:00
parent d1db070572
commit baff67fcd5
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2014-09-04 Jan D <jhd@f20.localdomain>
* xterm.c (x_term_init): Don't call x_session_initialize if running
as a daemon (Bug#18375).
* xsmfns.c: Initialize ice_fd.
2014-09-04 Paul Eggert <eggert@cs.ucla.edu>
Less chatter in 'make' output.

2
src/xsmfns.c
View File

@ -49,7 +49,7 @@ static struct input_event emacs_event;
/* The descriptor that we use to check for data from the session manager. */
static int ice_fd;
static int ice_fd = -1;
/* A flag that says if we are in shutdown interactions or not. */

4
src/xterm.c
View File

@ -11183,8 +11183,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
#ifdef HAVE_X_SM
/* Only do this for the very first display in the Emacs session.
Ignore X session management when Emacs was first started on a
tty. */
if (terminal->id == 1)
tty or started as a daemon. */
if (terminal->id == 1 && ! IS_DAEMON)
x_session_initialize (dpyinfo);
#endif