summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2022-05-06 14:04:55 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2022-05-06 14:04:55 +0200
commite41b7cc9353c63552219ff520da0adfef39157f2 (patch)
tree1d66633d73474b0da34827c2ec42a1d845457d06 /lisp/startup.el
parent44b5f0cd8732165747880109f7c5783534a3fbb0 (diff)
downloademacs-e41b7cc9353c63552219ff520da0adfef39157f2.tar.gz
Fix inhibiting reading the user init file with "emacs -x"
* lisp/startup.el (command-line): Really inhibit loading the user init file with "emacs -x".
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el8
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 57a38a295ed..0b7d90ecf2b 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1236,6 +1236,14 @@ please check its value")
(t
(setq argval nil
argi orig-argi)))))
+
+ ;; We handle "-scripteval" further down, but we have to
+ ;; inhibit loading the user init file first. (This is for
+ ;; "emacs -x" handling.)
+ (when (equal argi "-scripteval")
+ (setq init-file-user nil
+ noninteractive t))
+
(cond
;; The --display arg is handled partly in C, partly in Lisp.
;; When it shows up here, we just put it back to be handled