summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2008-02-12 23:30:33 +0000
committerJuri Linkov <juri@jurta.org>2008-02-12 23:30:33 +0000
commit4c9702c3e88137e8e0b51964b4ab5f8de5ff0814 (patch)
tree789e6040c378d98da91e71d36ba949f37d8c3c7d
parent5df71560b0f9c577cd23a56d2a726d50932a5c2a (diff)
downloademacs-4c9702c3e88137e8e0b51964b4ab5f8de5ff0814.tar.gz
(after-init-hook): Set inhibit-startup-screen to t
after reading the desktop.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/desktop.el4
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 49706f3c0aa..dc940e64ab9 100644
--- 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 61db03e8c86..8be86571f13 100644
--- 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)