diff options
| author | Jan Djärv | 2014-09-04 07:38:37 +0200 |
|---|---|---|
| committer | Jan Djärv | 2014-09-04 07:38:37 +0200 |
| commit | baff67fcd5d64af9d218204111d2566ae408c967 (patch) | |
| tree | f316d2f3da0ef7d774bb2952dcabdd09ad3cfebe /src/xterm.c | |
| parent | d1db070572aabbc55a419c8ce0b048901c6bafd3 (diff) | |
| download | emacs-baff67fcd5d64af9d218204111d2566ae408c967.tar.gz emacs-baff67fcd5d64af9d218204111d2566ae408c967.zip | |
* 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/xterm.c')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index beb7d78841d..767de9786cb 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -11183,8 +11183,8 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) | |||
| 11183 | #ifdef HAVE_X_SM | 11183 | #ifdef HAVE_X_SM |
| 11184 | /* Only do this for the very first display in the Emacs session. | 11184 | /* Only do this for the very first display in the Emacs session. |
| 11185 | Ignore X session management when Emacs was first started on a | 11185 | Ignore X session management when Emacs was first started on a |
| 11186 | tty. */ | 11186 | tty or started as a daemon. */ |
| 11187 | if (terminal->id == 1) | 11187 | if (terminal->id == 1 && ! IS_DAEMON) |
| 11188 | x_session_initialize (dpyinfo); | 11188 | x_session_initialize (dpyinfo); |
| 11189 | #endif | 11189 | #endif |
| 11190 | 11190 | ||