(custom-variable-menu, custom-face-menu)

(custom-group-menu): Check init-file-user rather than
user-init-file, in case cus-edit is loaded by site-run-file.

2 files changed, 19 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3faf83b6e61..df0bb34172a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-12  Glenn Morris  <rgm@gnu.org>
+
+        * cus-edit.el (custom-variable-menu, custom-face-menu)
+        (custom-group-menu): Check init-file-user rather than
+        user-init-file, in case cus-edit is loaded by site-run-file.
+
 2007-10-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el (vc-deduce-fileset): Delete unused code.
@@ -17,8 +23,8 @@
         (with-vc-properties): Fievaluation time of a macro argument.
 
         * ediff-vers.el (ediff-vc-internal):
-        vc-hooks.el:
-        loaddefs.el: Follow up on VC terminology change.
+        * vc-hooks.el:
+        * loaddefs.el: Follow up on VC terminology change.
 
 2007-10-11  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 8f7ad22dce6..3bc83604227 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2682,7 +2682,12 @@ try matching its doc string against `custom-guess-doc-alist'."
   `(("Set for Current Session" custom-variable-set
      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))
-    ,@(when (or custom-file user-init-file)
+    ;; Note that in all the backquoted code in this file, we test
+    ;; init-file-user rather than user-init-file.  This is in case
+    ;; cus-edit is loaded by something in site-start.el, because
+    ;; user-init-file is not set at that stage.
+    ;; http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00310.html
+    ,@(when (or custom-file init-file-user)
         '(("Save for Future Sessions" custom-variable-save
            (lambda (widget)
              (memq (widget-get widget :custom-state)
@@ -2697,7 +2702,7 @@ try matching its doc string against `custom-guess-doc-alist'."
                 (get (widget-value widget) 'saved-variable-comment))
             (memq (widget-get widget :custom-state)
                   '(modified set changed rogue)))))
-    ,@(when (or custom-file user-init-file)
+    ,@(when (or custom-file init-file-user)
         '(("Erase Customization" custom-variable-reset-standard
            (lambda (widget)
              (and (get (widget-value widget) 'standard-value)
@@ -3371,7 +3376,7 @@ SPEC must be a full face spec."
 
 (defvar custom-face-menu
   `(("Set for Current Session" custom-face-set)
-    ,@(when (or custom-file user-init-file)
+    ,@(when (or custom-file init-file-user)
         '(("Save for Future Sessions" custom-face-save)))
     ("Undo Edits" custom-redraw
      (lambda (widget)
@@ -3380,7 +3385,7 @@ SPEC must be a full face spec."
      (lambda (widget)
        (or (get (widget-value widget) 'saved-face)
            (get (widget-value widget) 'saved-face-comment))))
-    ,@(when (or custom-file user-init-file)
+    ,@(when (or custom-file init-file-user)
         '(("Erase Customization" custom-face-reset-standard
            (lambda (widget)
              (get (widget-value widget) 'face-defface-spec)))))
@@ -3978,7 +3983,7 @@ Creating group members... %2d%%"
   `(("Set for Current Session" custom-group-set
      (lambda (widget)
        (eq (widget-get widget :custom-state) 'modified)))
-    ,@(when (or custom-file user-init-file)
+    ,@(when (or custom-file init-file-user)
         '(("Save for Future Sessions" custom-group-save
            (lambda (widget)
              (memq (widget-get widget :custom-state) '(modified set))))))
@@ -3988,7 +3993,7 @@ Creating group members... %2d%%"
     ("Reset to Saved" custom-group-reset-saved
      (lambda (widget)
        (memq (widget-get widget :custom-state) '(modified set))))
-    ,@(when (or custom-file user-init-file)
+    ,@(when (or custom-file init-file-user)
         '(("Erase Customization" custom-group-reset-standard
            (lambda (widget)
              (memq (widget-get widget :custom-state) '(modified set saved)))))))