diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-04-20 17:46:24 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-04-20 17:46:24 -0400 |
| commit | b32683f1df42b1f622f5d88bae4fc46354bbe0df (patch) | |
| tree | 8e6f1936126316679916f6c4489a4aff58676857 /lisp/startup.el | |
| parent | 83e923bf37f17682ba331db83d268921ac0a4d1a (diff) | |
| download | emacs-b32683f1df42b1f622f5d88bae4fc46354bbe0df.tar.gz | |
* lisp/startup.el (command-line) <site-run-file>: Avoid rogue value in emacs -Q.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 7 |
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") ((member argi '("-Q" "-quick")) (setq init-file-user nil site-run-file nil - inhibit-x-resources t)) + inhibit-x-resources t) + ;; Stop it showing up in emacs -Q's customize-rogue. + (put 'site-run-file 'standard-value '(nil))) ((member argi '("-no-x-resources")) (setq inhibit-x-resources t)) ((member argi '("-D" "-basic-display")) @@ -920,7 +922,8 @@ please check its value") (setq init-file-user (or argval (pop args)) argval nil)) ((equal argi "-no-site-file") - (setq site-run-file nil)) + (setq site-run-file nil) + (put 'site-run-file 'standard-value '(nil))) ((equal argi "-debug-init") (setq init-file-debug t)) ((equal argi "-iconic") |