From 1e4f6cec8245212941b364acd952ab8651dcd065 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Tue, 12 Mar 2002 19:15:06 +0000 Subject: [PATCH] (emacs-session-restore): Take previous id as an argument. --- lisp/ChangeLog | 8 ++++++++ lisp/term/x-win.el | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0fc898b4df6..c6c6dfec84f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2002-03-12 Jan D. + + * term/x-win.el (emacs-session-restore): Take previous id as + an argument. + + * startup.el (command-line): Must check that x-session-previous-id + is bound also, for non-X platforms. + 2002-03-12 Gerd Moellmann * emacs-lisp/cl-indent.el (lisp-loop-keyword-indentation) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 11c7e154d59..406cc5a3eae 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -290,11 +290,11 @@ that it should abort the window system shutdown." (kill-buffer buf) cancel-shutdown)))) -(defun emacs-session-restore () +(defun emacs-session-restore (previous-session-id) "Restore the Emacs session if started by a session manager. The file saved by `emacs-session-save' is evaluated and deleted if it exists." - (let ((filename (emacs-session-filename x-session-previous-id))) + (let ((filename (emacs-session-filename previous-session-id))) (when (file-exists-p filename) (load-file filename) (delete-file filename) -- 2.39.2