diff options
| author | Richard M. Stallman | 2006-01-08 03:55:27 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-01-08 03:55:27 +0000 |
| commit | 671779752f47bd0e01381241845fe759d1560a37 (patch) | |
| tree | 16e47c3b327bbe68894378aa6683a2880676f7c6 | |
| parent | 3af622d538978d2e5ef4d51e02c40d5da48bfbfe (diff) | |
| download | emacs-671779752f47bd0e01381241845fe759d1560a37.tar.gz emacs-671779752f47bd0e01381241845fe759d1560a37.zip | |
(Custom-set, Custom-save): Doc fix.
(Custom-reset-current, Custom-reset-saved): Change question text.
(Custom-reset-standard): Likewise.
(custom-variable-reset-saved): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 18 |
2 files changed, 18 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 59f1a820ed7..b6dc65427a7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2006-01-07 Richard M. Stallman <rms@gnu.org> | ||
| 2 | |||
| 3 | * cus-edit.el (Custom-set, Custom-save): Doc fix. | ||
| 4 | (Custom-reset-current, Custom-reset-saved): Change question text. | ||
| 5 | (Custom-reset-standard): Likewise. | ||
| 6 | (custom-variable-reset-saved): Doc fix. | ||
| 7 | |||
| 1 | 2006-01-07 Eli Zaretskii <eliz@gnu.org> | 8 | 2006-01-07 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * startup.el (init-file-user): Doc fix. | 10 | * startup.el (init-file-user): Doc fix. |
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 5a4b499d792..b82510e0174 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el | |||
| @@ -744,7 +744,7 @@ groups after non-groups, if nil do not order groups at all." | |||
| 744 | "Customization widgets in the current buffer.") | 744 | "Customization widgets in the current buffer.") |
| 745 | 745 | ||
| 746 | (defun Custom-set () | 746 | (defun Custom-set () |
| 747 | "Set changes in all modified options." | 747 | "Set the current value of all edited settings in the buffer." |
| 748 | (interactive) | 748 | (interactive) |
| 749 | (if (y-or-n-p "Set all values according to this buffer? ") | 749 | (if (y-or-n-p "Set all values according to this buffer? ") |
| 750 | (let ((children custom-options)) | 750 | (let ((children custom-options)) |
| @@ -755,7 +755,9 @@ groups after non-groups, if nil do not order groups at all." | |||
| 755 | (message "Aborted"))) | 755 | (message "Aborted"))) |
| 756 | 756 | ||
| 757 | (defun Custom-save () | 757 | (defun Custom-save () |
| 758 | "Set all modified group members and save them." | 758 | "Set all edited settings, then save all settings that have been set. |
| 759 | If a setting was edited and set before, this saves it. | ||
| 760 | If a setting was merely edited before, this sets it then saves it." | ||
| 759 | (interactive) | 761 | (interactive) |
| 760 | (if (yes-or-no-p "Save all settings in this buffer? ") | 762 | (if (yes-or-no-p "Save all settings in this buffer? ") |
| 761 | (let ((children custom-options)) | 763 | (let ((children custom-options)) |
| @@ -786,9 +788,9 @@ when the action is chosen.") | |||
| 786 | (funcall answer)))) | 788 | (funcall answer)))) |
| 787 | 789 | ||
| 788 | (defun Custom-reset-current (&rest ignore) | 790 | (defun Custom-reset-current (&rest ignore) |
| 789 | "Reset all modified group members to their current value." | 791 | "Reset all edited settings in the buffer to show their current values." |
| 790 | (interactive) | 792 | (interactive) |
| 791 | (if (y-or-n-p "Reset buffer to show current settings? ") | 793 | (if (y-or-n-p "Reset all settings' buffer text to show current values? ") |
| 792 | (let ((children custom-options)) | 794 | (let ((children custom-options)) |
| 793 | (mapc (lambda (widget) | 795 | (mapc (lambda (widget) |
| 794 | (if (memq (widget-get widget :custom-state) | 796 | (if (memq (widget-get widget :custom-state) |
| @@ -798,9 +800,10 @@ when the action is chosen.") | |||
| 798 | (message "Aborted"))) | 800 | (message "Aborted"))) |
| 799 | 801 | ||
| 800 | (defun Custom-reset-saved (&rest ignore) | 802 | (defun Custom-reset-saved (&rest ignore) |
| 801 | "Reset all modified or set group members to their saved value." | 803 | "Reset all edited or set settings in the buffer to their saved value. |
| 804 | This also shows the saved values in the buffer." | ||
| 802 | (interactive) | 805 | (interactive) |
| 803 | (if (y-or-n-p "Reset all settings to saved values? ") | 806 | (if (y-or-n-p "Reset all settings (current values and buffer text) to saved values? ") |
| 804 | (let ((children custom-options)) | 807 | (let ((children custom-options)) |
| 805 | (mapc (lambda (widget) | 808 | (mapc (lambda (widget) |
| 806 | (if (memq (widget-get widget :custom-state) | 809 | (if (memq (widget-get widget :custom-state) |
| @@ -819,7 +822,7 @@ making them as if they had never been customized at all." | |||
| 819 | (if (or (and (= 1 (length children)) | 822 | (if (or (and (= 1 (length children)) |
| 820 | (memq (widget-type (car children)) | 823 | (memq (widget-type (car children)) |
| 821 | '(custom-variable custom-face))) | 824 | '(custom-variable custom-face))) |
| 822 | (yes-or-no-p "Erase all customizations in this buffer? ")) | 825 | (yes-or-no-p "Erase all customizations for settings in this buffer? ")) |
| 823 | (mapc (lambda (widget) | 826 | (mapc (lambda (widget) |
| 824 | (and (if (widget-get widget :custom-standard-value) | 827 | (and (if (widget-get widget :custom-standard-value) |
| 825 | (widget-apply widget :custom-standard-value) | 828 | (widget-apply widget :custom-standard-value) |
| @@ -2783,6 +2786,7 @@ Optional EVENT is the location for the menu." | |||
| 2783 | 2786 | ||
| 2784 | (defun custom-variable-reset-saved (widget) | 2787 | (defun custom-variable-reset-saved (widget) |
| 2785 | "Restore the saved value for the variable being edited by WIDGET. | 2788 | "Restore the saved value for the variable being edited by WIDGET. |
| 2789 | This also updates the buffer to show that value. | ||
| 2786 | The value that was current before this operation | 2790 | The value that was current before this operation |
| 2787 | becomes the backup value, so you can get it again." | 2791 | becomes the backup value, so you can get it again." |
| 2788 | (let* ((symbol (widget-value widget)) | 2792 | (let* ((symbol (widget-value widget)) |