diff options
| author | Daniel Colascione | 2018-06-08 16:21:39 -0700 |
|---|---|---|
| committer | Daniel Colascione | 2018-06-08 16:22:35 -0700 |
| commit | d1febb42f48cd9906713d2a2f4501a7059d7d171 (patch) | |
| tree | 63198266d85903daec501c4c648fe73dbe7ee52c | |
| parent | 38111b5e98380c518aeb1bb7be52b7972a248332 (diff) | |
| download | emacs-d1febb42f48cd9906713d2a2f4501a7059d7d171.tar.gz emacs-d1febb42f48cd9906713d2a2f4501a7059d7d171.zip | |
Make setting inhibit-startup-screen in early init work
* lisp/startup.el (command-line): Bind `inhibit-startup-screen'
around loading the site file instead of unconditionally
resetting it.
| -rw-r--r-- | lisp/startup.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 83fd190ea2b..245b9ac5ba4 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -1287,11 +1287,10 @@ please check its value") | |||
| 1287 | ;; should check init-file-user instead, since that is already set. | 1287 | ;; should check init-file-user instead, since that is already set. |
| 1288 | ;; See cus-edit.el for an example. | 1288 | ;; See cus-edit.el for an example. |
| 1289 | (if site-run-file | 1289 | (if site-run-file |
| 1290 | (load site-run-file t t)) | 1290 | ;; Sites should not disable the startup screen. |
| 1291 | 1291 | ;; Only individuals should disable the startup screen. | |
| 1292 | ;; Sites should not disable this. Only individuals should disable | 1292 | (let ((inhibit-startup-screen inhibit-startup-screen)) |
| 1293 | ;; the startup screen. | 1293 | (load site-run-file t t))) |
| 1294 | (setq inhibit-startup-screen nil) | ||
| 1295 | 1294 | ||
| 1296 | ;; Load that user's init file, or the default one, or none. | 1295 | ;; Load that user's init file, or the default one, or none. |
| 1297 | (load-user-init-file | 1296 | (load-user-init-file |