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.

diff --git a/lisp/startup.el b/lisp/startup.el
index 83fd190ea2b27e00075d929ff5ce7dbd739717d2..245b9ac5ba43167767ccf544282ad3d7c2cc5d67 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1287,11 +1287,10 @@ please check its value")
     ;; should check init-file-user instead, since that is already set.
     ;; See cus-edit.el for an example.
     (if site-run-file
-       (load site-run-file t t))
-
-    ;; Sites should not disable this.  Only individuals should disable
-    ;; the startup screen.
-    (setq inhibit-startup-screen nil)
+        ;; Sites should not disable the startup screen.
+        ;; Only individuals should disable the startup screen.
+        (let ((inhibit-startup-screen inhibit-startup-screen))
+         (load site-run-file t t)))
 
     ;; Load that user's init file, or the default one, or none.
     (load-user-init-file