(after-init-hook): Set inhibit-startup-screen to t

after reading the desktop.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49706f3c0aafa3c3df6e797174ff2fdf9b0bb238..dc940e64ab9de1bfb65781b6c8412c90bfa35212 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-12  Juri Linkov  <juri@jurta.org>
+
+       * startup.el (fancy-startup-screen, normal-splash-screen):
+       Set default-directory to command-line-default-directory.
+
+       * desktop.el (after-init-hook): Set inhibit-startup-screen to t
+       after reading the desktop.
+
 2008-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * font-lock.el (font-lock-set-defaults): Unset previously set variables

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 61db03e8c8690b0dbc60857a052fbeff1573280d..8be86571f1335e71660b55df7ab0368c6939e4f1 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1289,7 +1289,9 @@ If there are no buffers left to create, kill the timer."
       (when (member key command-line-args)
         (setq command-line-args (delete key command-line-args))
         (setq desktop-save-mode nil)))
-    (when desktop-save-mode (desktop-read))))
+    (when desktop-save-mode
+      (desktop-read)
+      (setq inhibit-startup-screen t))))
 
 (provide 'desktop)