Mercurial > emacs
changeset 43870:84609ef8ec93
*** empty log message ***
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Tue, 12 Mar 2002 21:15:39 +0000 |
| parents | 606bb58da5c4 |
| children | 30ac1705a166 |
| files | lisp/ChangeLog src/ChangeLog |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Mar 12 21:15:07 2002 +0000 +++ b/lisp/ChangeLog Tue Mar 12 21:15:39 2002 +0000 @@ -2,6 +2,7 @@ * term/x-win.el (emacs-session-restore): Take previous id as an argument. + (emacs-session-save): Add comment that return t means cancel shutdown * startup.el (command-line): Must check that x-session-previous-id is bound also, for non-X platforms.
--- a/src/ChangeLog Tue Mar 12 21:15:07 2002 +0000 +++ b/src/ChangeLog Tue Mar 12 21:15:39 2002 +0000 @@ -21,10 +21,11 @@ 2002-03-10 Jan D. <Jan.Djarv@mbox200.swipnet.se> - * xterm.h: Declare x_session_check_input and x_session_initialize. - - * xterm.c: Add calls to x_session_check_input and - x_session_initialize. + * xterm.h: (x_session_check_input, x_session_initialize): Declared. + + * xterm.c: (XTread_socket): Add call to x_session_check_input and + x_session_have_connection. + (x_initialize): Add call to x_session_initialize. * termhooks.h (enum event_kind): Add save_session_event. @@ -36,7 +37,9 @@ * config.in: Add HAVE_X_SM. - * Makefile.in: Add test for HAVE_X_SM and new file xsmfns.c + * Makefile.in: Add -lSM -lICE to LIBXT if HAVE_X_SM and not + USE_X_TOOLKIT. + New file xsmfns.c added to XOBJ. * xsmfns.c: New file for X session management.