Mercurial > emacs
changeset 79040:853a17baf2b0
(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.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 12 Oct 2007 02:53:42 +0000 |
| parents | ed7decb02144 |
| children | 64606d994362 |
| files | lisp/cus-edit.el |
| diffstat | 1 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/cus-edit.el Fri Oct 12 02:49:58 2007 +0000 +++ b/lisp/cus-edit.el Fri Oct 12 02:53:42 2007 +0000 @@ -2744,7 +2744,12 @@ `(("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) @@ -2759,7 +2764,7 @@ (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) @@ -3416,7 +3421,7 @@ (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) @@ -3425,7 +3430,7 @@ (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))))) @@ -4025,7 +4030,7 @@ `(("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)))))) @@ -4035,7 +4040,7 @@ ("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)))))))