Commit e27e48b5 authored by Glenn Morris's avatar Glenn Morris
Browse files

(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.
parent dbffff5b
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 Juanma Barranquero <lekktu@gmail.com>
 
* follow.el (follow-stop-intercept-process-output):
......@@ -2744,7 +2744,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)
......@@ -2759,7 +2764,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)
......@@ -3416,7 +3421,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)
......@@ -3425,7 +3430,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)))))
......@@ -4025,7 +4030,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))))))
......@@ -4035,7 +4040,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)))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment