diff options
| -rw-r--r-- | lisp/cus-edit.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index a5f9e301946..286027ac46d 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el | |||
| @@ -1485,7 +1485,8 @@ See ") | |||
| 1485 | :help-echo "Read the online help." | 1485 | :help-echo "Read the online help." |
| 1486 | "(emacs)Easy Customization") | 1486 | "(emacs)Easy Customization") |
| 1487 | (widget-insert " for more information.\n\n") | 1487 | (widget-insert " for more information.\n\n") |
| 1488 | (widget-insert "Operate on everything in this buffer:\n ")) | 1488 | (widget-insert "Operate on all settings in this buffer that \ |
| 1489 | are not marked HIDDEN:\n ")) | ||
| 1489 | (widget-insert " ")) | 1490 | (widget-insert " ")) |
| 1490 | (widget-create 'push-button | 1491 | (widget-create 'push-button |
| 1491 | :tag "Set for Current Session" | 1492 | :tag "Set for Current Session" |
| @@ -3323,7 +3324,7 @@ SPEC must be a full face spec." | |||
| 3323 | (defvar custom-face-menu | 3324 | (defvar custom-face-menu |
| 3324 | `(("Set for Current Session" custom-face-set) | 3325 | `(("Set for Current Session" custom-face-set) |
| 3325 | ,@(when (or custom-file user-init-file) | 3326 | ,@(when (or custom-file user-init-file) |
| 3326 | '(("Save for Future Sessions" custom-face-save-command))) | 3327 | '(("Save for Future Sessions" custom-face-save))) |
| 3327 | ("Undo Edits" custom-redraw | 3328 | ("Undo Edits" custom-redraw |
| 3328 | (lambda (widget) | 3329 | (lambda (widget) |
| 3329 | (memq (widget-get widget :custom-state) '(modified changed)))) | 3330 | (memq (widget-get widget :custom-state) '(modified changed)))) |
| @@ -3448,13 +3449,8 @@ Optional EVENT is the location for the menu." | |||
| 3448 | (custom-face-state-set widget) | 3449 | (custom-face-state-set widget) |
| 3449 | (custom-redraw-magic widget))) | 3450 | (custom-redraw-magic widget))) |
| 3450 | 3451 | ||
| 3451 | (defun custom-face-save-command (widget) | ||
| 3452 | "Save in `.emacs' the face attributes in WIDGET." | ||
| 3453 | (custom-face-save widget) | ||
| 3454 | (custom-save-all)) | ||
| 3455 | |||
| 3456 | (defun custom-face-save (widget) | 3452 | (defun custom-face-save (widget) |
| 3457 | "Prepare for saving WIDGET's face attributes, but don't write `.emacs'." | 3453 | "Save in `.emacs' the face attributes in WIDGET." |
| 3458 | (let* ((symbol (widget-value widget)) | 3454 | (let* ((symbol (widget-value widget)) |
| 3459 | (child (car (widget-get widget :children))) | 3455 | (child (car (widget-get widget :children))) |
| 3460 | (value (custom-post-filter-face-spec (widget-value child))) | 3456 | (value (custom-post-filter-face-spec (widget-value child))) |
| @@ -3480,6 +3476,10 @@ Optional EVENT is the location for the menu." | |||
| 3480 | (custom-face-state-set widget) | 3476 | (custom-face-state-set widget) |
| 3481 | (custom-redraw-magic widget))) | 3477 | (custom-redraw-magic widget))) |
| 3482 | 3478 | ||
| 3479 | ;; For backward compatibility. | ||
| 3480 | (define-obsolete-function-alias 'custom-face-save-command 'custom-face-save | ||
| 3481 | "22.1") | ||
| 3482 | |||
| 3483 | (defun custom-face-reset-saved (widget) | 3483 | (defun custom-face-reset-saved (widget) |
| 3484 | "Restore WIDGET to the face's default attributes." | 3484 | "Restore WIDGET to the face's default attributes." |
| 3485 | (let* ((symbol (widget-value widget)) | 3485 | (let* ((symbol (widget-value widget)) |