From: Jan Djärv <jan.h.d@swipnet.se>
Date: Tue, 12 Mar 2002 19:13:52 +0000 (+0000)
Subject: (command-line): Must check that x-session-previous-id
X-Git-Tag: ttn-vms-21-2-B4~16209
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70646cf0fc77aeeb6dbba72a84e51d7bc0fe8ec3;p=emacs.git

(command-line): Must check that x-session-previous-id
is bound also, for non-X platforms.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 91364af7688..09aaba6e2be 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1033,8 +1033,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
   ;; Run emacs-session-restore (session management) if started by
   ;; the session manager and we have a session manager connection.
-  (if (and (stringp x-session-previous-id) (stringp x-session-id))
-      (emacs-session-restore)))
+  (if (and (boundp 'x-session-previous-id) (stringp x-session-previous-id))
+      (emacs-session-restore x-session-previous-id)))
 
 (defcustom initial-scratch-message (purecopy "\
 ;; This buffer is for notes you don't want to save, and for Lisp evaluation.