diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2014-09-04 07:38:37 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2014-09-04 07:38:37 +0200 |
| commit | baff67fcd5d64af9d218204111d2566ae408c967 (patch) | |
| tree | f316d2f3da0ef7d774bb2952dcabdd09ad3cfebe /src/xsmfns.c | |
| parent | d1db070572aabbc55a419c8ce0b048901c6bafd3 (diff) | |
| download | emacs-baff67fcd5d64af9d218204111d2566ae408c967.tar.gz | |
* xsmfns.c: Initialize ice_fd.
* xterm.c (x_term_init): Don't call x_session_initialize if running
as a daemon.
Fixes: debbugs:18375
Diffstat (limited to 'src/xsmfns.c')
| -rw-r--r-- | src/xsmfns.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xsmfns.c b/src/xsmfns.c index 81b012690f9..8721cc81b03 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -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. */ |