From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 6 May 2022 12:04:55 +0000 (+0200)
Subject: Fix inhibiting reading the user init file with "emacs -x"
X-Git-Tag: emacs-29.0.90~1931^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e41b7cc9353c63552219ff520da0adfef39157f2;p=emacs.git

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".
---

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