summaryrefslogtreecommitdiff
path: root/lisp/startup.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2007-10-12 02:50:38 +0000
committerGlenn Morris <rgm@gnu.org>2007-10-12 02:50:38 +0000
commit5f14478455a90bbd012bf9d5a4d351d8ca743550 (patch)
tree7269f56b1633f971d5fc537232496366cb977682 /lisp/startup.el
parent5e8b0a322e0573b4d501fa11be6501bd54fe3a6c (diff)
downloademacs-5f14478455a90bbd012bf9d5a4d351d8ca743550.tar.gz
Comment.
Diffstat (limited to 'lisp/startup.el')
-rw-r--r--lisp/startup.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/startup.el b/lisp/startup.el
index ef0e750d7dc..53fdbf3939d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -874,6 +874,10 @@ opening the first frame (e.g. open a connection to an X server).")
;; Run the site-start library if it exists. The point of this file is
;; that it is run before .emacs. There is no point in doing this after
;; .emacs; that is useless.
+ ;; Note that user-init-file is nil at this point. Code that might
+ ;; be loaded from site-run-file and wants to test if -q was given
+ ;; should check init-file-user instead, since that is already set.
+ ;; See cus-edit.el for an example.
(if site-run-file
(load site-run-file t t))