diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-08-04 00:46:55 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-08-04 00:46:55 +0000 |
| commit | d51abf2262fe5195c781647c6a1cc57d1a7e6509 (patch) | |
| tree | 0f4ad3bd1c184363212f13b559f4120629c2837d /src/xsmfns.c | |
| parent | e682e37ece43c06248fd4b9a46907cb1ec272e7d (diff) | |
| download | emacs-d51abf2262fe5195c781647c6a1cc57d1a7e6509.tar.gz | |
Work around crashes in X session management after normal shutdown of X server.
* src/xsmfns.c (x_session_close): New function.
* src/xterm.h: Declare it.
* src/xterm.c (XTread_socket): Don't call x_session_check_input for
secondary displays.
(x_term_init): Do not initialize X session management when the initial
display was a tty frame.
(x_delete_display): Close X session management when we close its display.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-390
Diffstat (limited to 'src/xsmfns.c')
| -rw-r--r-- | src/xsmfns.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/xsmfns.c b/src/xsmfns.c index 3c1231e1732..88bc416e5d9 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -516,6 +516,14 @@ x_session_initialize (dpyinfo) } } +/* Ensure that the session manager is not contacted again. */ + +void +x_session_close () +{ + ice_fd = -1; +} + DEFUN ("handle-save-session", Fhandle_save_session, Shandle_save_session, 1, 1, "e", |