diff options
| author | Jan Djärv | 2002-03-12 19:13:52 +0000 |
|---|---|---|
| committer | Jan Djärv | 2002-03-12 19:13:52 +0000 |
| commit | 70646cf0fc77aeeb6dbba72a84e51d7bc0fe8ec3 (patch) | |
| tree | 4be1a8c0f75f9e4eedfe57a9e7aaeab1df24b2c4 | |
| parent | 8460b6897bfcd611e8a7ea737c84d1c544f46115 (diff) | |
| download | emacs-70646cf0fc77aeeb6dbba72a84e51d7bc0fe8ec3.tar.gz emacs-70646cf0fc77aeeb6dbba72a84e51d7bc0fe8ec3.zip | |
(command-line): Must check that x-session-previous-id
is bound also, for non-X platforms.
| -rw-r--r-- | lisp/startup.el | 4 |
1 files changed, 2 insertions, 2 deletions
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'." | |||
| 1033 | 1033 | ||
| 1034 | ;; Run emacs-session-restore (session management) if started by | 1034 | ;; Run emacs-session-restore (session management) if started by |
| 1035 | ;; the session manager and we have a session manager connection. | 1035 | ;; the session manager and we have a session manager connection. |
| 1036 | (if (and (stringp x-session-previous-id) (stringp x-session-id)) | 1036 | (if (and (boundp 'x-session-previous-id) (stringp x-session-previous-id)) |
| 1037 | (emacs-session-restore))) | 1037 | (emacs-session-restore x-session-previous-id))) |
| 1038 | 1038 | ||
| 1039 | (defcustom initial-scratch-message (purecopy "\ | 1039 | (defcustom initial-scratch-message (purecopy "\ |
| 1040 | ;; This buffer is for notes you don't want to save, and for Lisp evaluation. | 1040 | ;; This buffer is for notes you don't want to save, and for Lisp evaluation. |