# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1015777774 0
# Node ID f57c0d6e61c603b5428066364ac20b4767b5cc16
# Parent  41972a678f6289adea84634108056b27981033d8
(command-line): Add call to emacs-session-restore

diff -r 41972a678f62 -r f57c0d6e61c6 lisp/startup.el
--- a/lisp/startup.el	Sun Mar 10 16:27:26 2002 +0000
+++ b/lisp/startup.el	Sun Mar 10 16:29:34 2002 +0000
@@ -236,7 +236,8 @@
     ("--cursor-color" 1 x-handle-switch cursor-color)
     ("--vertical-scroll-bars" 0 x-handle-switch vertical-scroll-bars t)
     ("--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.
 Each element has the form
   (NAME NUMARGS HANDLER FRAME-PARAM VALUE)
@@ -1028,7 +1029,12 @@
   (command-line-1 (cdr command-line-args))
 
   ;; 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 "\
 ;; This buffer is for notes you don't want to save, and for Lisp evaluation.