Mercurial > emacs
comparison lisp/cus-edit.el @ 85180:8cef7e8125fd
(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:54:13 +0000 |
| parents | 56754c942db2 |
| children | b210bba3f477 d38543a1c0f9 |
comparison
equal
deleted
inserted
replaced
| 85179:8a350c3c191b | 85180:8cef7e8125fd |
|---|---|
| 2680 | 2680 |
| 2681 (defvar custom-variable-menu | 2681 (defvar custom-variable-menu |
| 2682 `(("Set for Current Session" custom-variable-set | 2682 `(("Set for Current Session" custom-variable-set |
| 2683 (lambda (widget) | 2683 (lambda (widget) |
| 2684 (eq (widget-get widget :custom-state) 'modified))) | 2684 (eq (widget-get widget :custom-state) 'modified))) |
| 2685 ,@(when (or custom-file user-init-file) | 2685 ;; Note that in all the backquoted code in this file, we test |
| 2686 ;; init-file-user rather than user-init-file. This is in case | |
| 2687 ;; cus-edit is loaded by something in site-start.el, because | |
| 2688 ;; user-init-file is not set at that stage. | |
| 2689 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00310.html | |
| 2690 ,@(when (or custom-file init-file-user) | |
| 2686 '(("Save for Future Sessions" custom-variable-save | 2691 '(("Save for Future Sessions" custom-variable-save |
| 2687 (lambda (widget) | 2692 (lambda (widget) |
| 2688 (memq (widget-get widget :custom-state) | 2693 (memq (widget-get widget :custom-state) |
| 2689 '(modified set changed rogue)))))) | 2694 '(modified set changed rogue)))))) |
| 2690 ("Undo Edits" custom-redraw | 2695 ("Undo Edits" custom-redraw |
| 2695 (lambda (widget) | 2700 (lambda (widget) |
| 2696 (and (or (get (widget-value widget) 'saved-value) | 2701 (and (or (get (widget-value widget) 'saved-value) |
| 2697 (get (widget-value widget) 'saved-variable-comment)) | 2702 (get (widget-value widget) 'saved-variable-comment)) |
| 2698 (memq (widget-get widget :custom-state) | 2703 (memq (widget-get widget :custom-state) |
| 2699 '(modified set changed rogue))))) | 2704 '(modified set changed rogue))))) |
| 2700 ,@(when (or custom-file user-init-file) | 2705 ,@(when (or custom-file init-file-user) |
| 2701 '(("Erase Customization" custom-variable-reset-standard | 2706 '(("Erase Customization" custom-variable-reset-standard |
| 2702 (lambda (widget) | 2707 (lambda (widget) |
| 2703 (and (get (widget-value widget) 'standard-value) | 2708 (and (get (widget-value widget) 'standard-value) |
| 2704 (memq (widget-get widget :custom-state) | 2709 (memq (widget-get widget :custom-state) |
| 2705 '(modified set changed saved rogue))))))) | 2710 '(modified set changed saved rogue))))))) |
| 3369 (widget-put widget :children children)) | 3374 (widget-put widget :children children)) |
| 3370 (message "Creating face editor...done")))))) | 3375 (message "Creating face editor...done")))))) |
| 3371 | 3376 |
| 3372 (defvar custom-face-menu | 3377 (defvar custom-face-menu |
| 3373 `(("Set for Current Session" custom-face-set) | 3378 `(("Set for Current Session" custom-face-set) |
| 3374 ,@(when (or custom-file user-init-file) | 3379 ,@(when (or custom-file init-file-user) |
| 3375 '(("Save for Future Sessions" custom-face-save))) | 3380 '(("Save for Future Sessions" custom-face-save))) |
| 3376 ("Undo Edits" custom-redraw | 3381 ("Undo Edits" custom-redraw |
| 3377 (lambda (widget) | 3382 (lambda (widget) |
| 3378 (memq (widget-get widget :custom-state) '(modified changed)))) | 3383 (memq (widget-get widget :custom-state) '(modified changed)))) |
| 3379 ("Reset to Saved" custom-face-reset-saved | 3384 ("Reset to Saved" custom-face-reset-saved |
| 3380 (lambda (widget) | 3385 (lambda (widget) |
| 3381 (or (get (widget-value widget) 'saved-face) | 3386 (or (get (widget-value widget) 'saved-face) |
| 3382 (get (widget-value widget) 'saved-face-comment)))) | 3387 (get (widget-value widget) 'saved-face-comment)))) |
| 3383 ,@(when (or custom-file user-init-file) | 3388 ,@(when (or custom-file init-file-user) |
| 3384 '(("Erase Customization" custom-face-reset-standard | 3389 '(("Erase Customization" custom-face-reset-standard |
| 3385 (lambda (widget) | 3390 (lambda (widget) |
| 3386 (get (widget-value widget) 'face-defface-spec))))) | 3391 (get (widget-value widget) 'face-defface-spec))))) |
| 3387 ("---" ignore ignore) | 3392 ("---" ignore ignore) |
| 3388 ("Add Comment" custom-comment-show custom-comment-invisible-p) | 3393 ("Add Comment" custom-comment-show custom-comment-invisible-p) |
| 3976 | 3981 |
| 3977 (defvar custom-group-menu | 3982 (defvar custom-group-menu |
| 3978 `(("Set for Current Session" custom-group-set | 3983 `(("Set for Current Session" custom-group-set |
| 3979 (lambda (widget) | 3984 (lambda (widget) |
| 3980 (eq (widget-get widget :custom-state) 'modified))) | 3985 (eq (widget-get widget :custom-state) 'modified))) |
| 3981 ,@(when (or custom-file user-init-file) | 3986 ,@(when (or custom-file init-file-user) |
| 3982 '(("Save for Future Sessions" custom-group-save | 3987 '(("Save for Future Sessions" custom-group-save |
| 3983 (lambda (widget) | 3988 (lambda (widget) |
| 3984 (memq (widget-get widget :custom-state) '(modified set)))))) | 3989 (memq (widget-get widget :custom-state) '(modified set)))))) |
| 3985 ("Undo Edits" custom-group-reset-current | 3990 ("Undo Edits" custom-group-reset-current |
| 3986 (lambda (widget) | 3991 (lambda (widget) |
| 3987 (memq (widget-get widget :custom-state) '(modified)))) | 3992 (memq (widget-get widget :custom-state) '(modified)))) |
| 3988 ("Reset to Saved" custom-group-reset-saved | 3993 ("Reset to Saved" custom-group-reset-saved |
| 3989 (lambda (widget) | 3994 (lambda (widget) |
| 3990 (memq (widget-get widget :custom-state) '(modified set)))) | 3995 (memq (widget-get widget :custom-state) '(modified set)))) |
| 3991 ,@(when (or custom-file user-init-file) | 3996 ,@(when (or custom-file init-file-user) |
| 3992 '(("Erase Customization" custom-group-reset-standard | 3997 '(("Erase Customization" custom-group-reset-standard |
| 3993 (lambda (widget) | 3998 (lambda (widget) |
| 3994 (memq (widget-get widget :custom-state) '(modified set saved))))))) | 3999 (memq (widget-get widget :custom-state) '(modified set saved))))))) |
| 3995 "Alist of actions for the `custom-group' widget. | 4000 "Alist of actions for the `custom-group' widget. |
| 3996 Each entry has the form (NAME ACTION FILTER) where NAME is the name of | 4001 Each entry has the form (NAME ACTION FILTER) where NAME is the name of |