From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 12 Mar 2002 19:15:06 +0000 (+0000)
Subject: (emacs-session-restore): Take previous id as an argument.
X-Git-Tag: ttn-vms-21-2-B4~16208
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1e4f6cec8245212941b364acd952ab8651dcd065;p=emacs.git

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

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.  <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 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)