emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master b32683f: * lisp/startup.el (command-line) <site-run


From: Glenn Morris
Subject: [Emacs-diffs] master b32683f: * lisp/startup.el (command-line) <site-run-file>: Avoid rogue value in emacs -Q.
Date: Mon, 20 Apr 2015 21:46:47 +0000

branch: master
commit b32683f1df42b1f622f5d88bae4fc46354bbe0df
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * lisp/startup.el (command-line) <site-run-file>: Avoid rogue value in 
emacs -Q.
---
 lisp/startup.el |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/startup.el b/lisp/startup.el
index 7fa929a..cb8a6a9 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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]