[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/startup.el
From: |
Jan Djärv |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/startup.el |
Date: |
Sun, 10 Mar 2002 11:29:34 -0500 |
Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.290 emacs/lisp/startup.el:1.291
*** emacs/lisp/startup.el:1.290 Wed Feb 6 09:59:10 2002
--- emacs/lisp/startup.el Sun Mar 10 11:29:34 2002
***************
*** 236,242 ****
("--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))
"Alist of X Windows options.
Each element has the form
(NAME NUMARGS HANDLER FRAME-PARAM VALUE)
--- 236,243 ----
("--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)
! ("--smid" 1 x-handle-smid))
"Alist of X Windows options.
Each element has the form
(NAME NUMARGS HANDLER FRAME-PARAM VALUE)
***************
*** 1028,1034 ****
(command-line-1 (cdr command-line-args))
;; If -batch, terminate after processing the command options.
! (if noninteractive (kill-emacs t)))
(defcustom initial-scratch-message (purecopy "\
;; This buffer is for notes you don't want to save, and for Lisp evaluation.
--- 1029,1040 ----
(command-line-1 (cdr command-line-args))
;; If -batch, terminate after processing the command options.
! (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.
- [Emacs-diffs] Changes to emacs/lisp/startup.el,
Jan Djärv <=