mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-26 10:49:33 +00:00
Code Issues Releases Activity

(command-line): Add call to emacs-session-restore

Browse Source
This commit is contained in:
Jan Djärv 2002-03-10 16:29:34 +00:00
parent 941a391a0b
commit ca57f55d6f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/startup.el
View File

@ -236,7 +236,8 @@ This is normally copied from `default-directory' when Emacs starts.")
("--cursor-color" 1 x-handle-switch cursor-color) ("--cursor-color" 1 x-handle-switch cursor-color)
("--vertical-scroll-bars" 0 x-handle-switch vertical-scroll-bars t) ("--vertical-scroll-bars" 0 x-handle-switch vertical-scroll-bars t)
("--line-spacing" 1 x-handle-numeric-switch line-spacing) ("--line-spacing" 1 x-handle-numeric-switch line-spacing)
("--border-color" 1 x-handle-switch border-width)) ("--border-color" 1 x-handle-switch border-width)
("--smid" 1 x-handle-smid))
"Alist of X Windows options. "Alist of X Windows options.
Each element has the form Each element has the form
(NAME NUMARGS HANDLER FRAME-PARAM VALUE) (NAME NUMARGS HANDLER FRAME-PARAM VALUE)
@ -1028,7 +1029,12 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(command-line-1 (cdr command-line-args)) (command-line-1 (cdr command-line-args))
;; If -batch, terminate after processing the command options. ;; If -batch, terminate after processing the command options.
(if noninteractive (kill-emacs t))) (if noninteractive (kill-emacs t))
;; 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)))
(defcustom initial-scratch-message (purecopy "\ (defcustom initial-scratch-message (purecopy "\
;; This buffer is for notes you don't want to save, and for Lisp evaluation. ;; This buffer is for notes you don't want to save, and for Lisp evaluation.