diff options
| author | Glenn Morris <rgm@gnu.org> | 2007-10-12 02:56:23 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2007-10-12 02:56:23 +0000 |
| commit | 9b5007e73117924e4c253eb628421be5deda3f4a (patch) | |
| tree | 2b9c9d919216dcce1eee09b3c31cf4d05793c790 /lisp/cus-edit.el | |
| parent | 5f14478455a90bbd012bf9d5a4d351d8ca743550 (diff) | |
| download | emacs-9b5007e73117924e4c253eb628421be5deda3f4a.tar.gz emacs-9b5007e73117924e4c253eb628421be5deda3f4a.tar.bz2 emacs-9b5007e73117924e4c253eb628421be5deda3f4a.zip | |
(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.
Diffstat (limited to 'lisp/cus-edit.el')
| -rw-r--r-- | lisp/cus-edit.el | 17 |
1 files changed, 11 insertions, 6 deletions
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))))))) |