(emacs-session-restore): Take previous id as an argument.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0fc898b4df6c6386219bc6558284553878f7feb8..c6c6dfec84f3ccda485c0302f1d529c97d6eb1a3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-12  Jan D.  <Jan.Djarv@mbox200.swipnet.se>
+
+       * 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  <gerd@gnu.org>
 
        * emacs-lisp/cl-indent.el (lisp-loop-keyword-indentation)

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 11c7e154d5928aef7d8acca473b965a337fc0ba3..406cc5a3eaef1ec8a5291f197e09806eba95ade3 100644 (file)
--- 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)