diff options
| author | Juri Linkov | 2008-02-12 23:30:33 +0000 |
|---|---|---|
| committer | Juri Linkov | 2008-02-12 23:30:33 +0000 |
| commit | 4c9702c3e88137e8e0b51964b4ab5f8de5ff0814 (patch) | |
| tree | 789e6040c378d98da91e71d36ba949f37d8c3c7d | |
| parent | 5df71560b0f9c577cd23a56d2a726d50932a5c2a (diff) | |
| download | emacs-4c9702c3e88137e8e0b51964b4ab5f8de5ff0814.tar.gz emacs-4c9702c3e88137e8e0b51964b4ab5f8de5ff0814.zip | |
(after-init-hook): Set inhibit-startup-screen to t
after reading the desktop.
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/desktop.el | 4 |
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 @@ | |||
| 1 | 2008-02-12 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * startup.el (fancy-startup-screen, normal-splash-screen): | ||
| 4 | Set default-directory to command-line-default-directory. | ||
| 5 | |||
| 6 | * desktop.el (after-init-hook): Set inhibit-startup-screen to t | ||
| 7 | after reading the desktop. | ||
| 8 | |||
| 1 | 2008-02-12 Stefan Monnier <monnier@iro.umontreal.ca> | 9 | 2008-02-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 10 | ||
| 3 | * font-lock.el (font-lock-set-defaults): Unset previously set variables | 11 | * 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." | |||
| 1289 | (when (member key command-line-args) | 1289 | (when (member key command-line-args) |
| 1290 | (setq command-line-args (delete key command-line-args)) | 1290 | (setq command-line-args (delete key command-line-args)) |
| 1291 | (setq desktop-save-mode nil))) | 1291 | (setq desktop-save-mode nil))) |
| 1292 | (when desktop-save-mode (desktop-read)))) | 1292 | (when desktop-save-mode |
| 1293 | (desktop-read) | ||
| 1294 | (setq inhibit-startup-screen t)))) | ||
| 1293 | 1295 | ||
| 1294 | (provide 'desktop) | 1296 | (provide 'desktop) |
| 1295 | 1297 | ||