aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-04-20 17:46:24 -0400
committerGlenn Morris2015-04-20 17:46:24 -0400
commitb32683f1df42b1f622f5d88bae4fc46354bbe0df (patch)
tree8e6f1936126316679916f6c4489a4aff58676857
parent83e923bf37f17682ba331db83d268921ac0a4d1a (diff)
downloademacs-b32683f1df42b1f622f5d88bae4fc46354bbe0df.tar.gz
emacs-b32683f1df42b1f622f5d88bae4fc46354bbe0df.zip
* lisp/startup.el (command-line) <site-run-file>: Avoid rogue value in emacs -Q.
-rw-r--r--lisp/startup.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index 7fa929a659d..cb8a6a94527 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -907,7 +907,9 @@ please check its value")
907 ((member argi '("-Q" "-quick")) 907 ((member argi '("-Q" "-quick"))
908 (setq init-file-user nil 908 (setq init-file-user nil
909 site-run-file nil 909 site-run-file nil
910 inhibit-x-resources t)) 910 inhibit-x-resources t)
911 ;; Stop it showing up in emacs -Q's customize-rogue.
912 (put 'site-run-file 'standard-value '(nil)))
911 ((member argi '("-no-x-resources")) 913 ((member argi '("-no-x-resources"))
912 (setq inhibit-x-resources t)) 914 (setq inhibit-x-resources t))
913 ((member argi '("-D" "-basic-display")) 915 ((member argi '("-D" "-basic-display"))
@@ -920,7 +922,8 @@ please check its value")
920 (setq init-file-user (or argval (pop args)) 922 (setq init-file-user (or argval (pop args))
921 argval nil)) 923 argval nil))
922 ((equal argi "-no-site-file") 924 ((equal argi "-no-site-file")
923 (setq site-run-file nil)) 925 (setq site-run-file nil)
926 (put 'site-run-file 'standard-value '(nil)))
924 ((equal argi "-debug-init") 927 ((equal argi "-debug-init")
925 (setq init-file-debug t)) 928 (setq init-file-debug t))
926 ((equal argi "-iconic") 929 ((equal argi "-iconic")