[Emacs-diffs] Changes to emacs/lisp/startup.el

[Richard M . Stallman]

Index: emacs/lisp/startup.el
diff -c emacs/lisp/startup.el:1.354 emacs/lisp/startup.el:1.355
*** emacs/lisp/startup.el:1.354 Mon Apr 18 00:55:42 2005
--- emacs/lisp/startup.el       Sat Apr 23 16:39:54 2005
***************
*** 995,1001 ****
    ;; the session manager and we have a session manager connection.
    (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.
--- 995,1002 ----
    ;; the session manager and we have a session manager connection.
    (if (and (boundp 'x-session-previous-id)
             (stringp x-session-previous-id))
!       (with-no-warnings
!       (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.