[Emacs-diffs] Changes to emacs/lisp/startup.el,v [EMACS_22_BASE]

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Glenn Morris <gm>       07/10/12 02:49:59

Index: startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.436.2.4
retrieving revision 1.436.2.5
diff -u -b -r1.436.2.4 -r1.436.2.5
--- startup.el  2 Aug 2007 17:49:33 -0000       1.436.2.4
+++ startup.el  12 Oct 2007 02:49:58 -0000      1.436.2.5
@@ -815,6 +815,10 @@
     ;; 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))