diff options
| author | Richard M. Stallman | 2006-01-02 03:43:35 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2006-01-02 03:43:35 +0000 |
| commit | b8919739a69b884caf9354d2b6d993b7b2d1dbfd (patch) | |
| tree | 1fd39440ea857e69eb5f5f66de6c07415c6e08cf | |
| parent | 107736a270f800eb8cf383dfd677922002c235eb (diff) | |
| download | emacs-b8919739a69b884caf9354d2b6d993b7b2d1dbfd.tar.gz emacs-b8919739a69b884caf9354d2b6d993b7b2d1dbfd.zip | |
Fix previous change.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/cus-edit.el | 29 |
2 files changed, 15 insertions, 16 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b254c481a12..1050d3deb84 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | * cus-edit.el (Custom-set, Custom-save): Ask for confirmation. | 3 | * cus-edit.el (Custom-set, Custom-save): Ask for confirmation. |
| 4 | (Custom-reset-current, Custom-reset-saved): Likewise. | 4 | (Custom-reset-current, Custom-reset-saved): Likewise. |
| 5 | (Custom-reset-standard): Likewise. | 5 | (Custom-reset-standard): Show message if aborted. |
| 6 | (custom-mode): Doc fix, describing those commands. | 6 | (custom-mode): Doc fix, describing those commands. |
| 7 | 7 | ||
| 8 | * mouse.el (mouse-drag-region-1): When following link via mouse-2, | 8 | * mouse.el (mouse-drag-region-1): When following link via mouse-2, |
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 55b739b9b4b..4c92034eaad 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el | |||
| @@ -815,21 +815,20 @@ The immediate result is to restore them to their standard values. | |||
| 815 | This operation eliminates any saved values for the group members, | 815 | This operation eliminates any saved values for the group members, |
| 816 | making them as if they had never been customized at all." | 816 | making them as if they had never been customized at all." |
| 817 | (interactive) | 817 | (interactive) |
| 818 | (if (yes-or-no-p "Eliminate saved values for all settings in this buffer? ") | 818 | (let ((children custom-options)) |
| 819 | (let ((children custom-options)) | 819 | (if (or (and (= 1 (length children)) |
| 820 | (when (or (and (= 1 (length children)) | 820 | (memq (widget-type (car children)) |
| 821 | (memq (widget-type (car children)) | 821 | '(custom-variable custom-face))) |
| 822 | '(custom-variable custom-face))) | 822 | (yes-or-no-p "Really erase all customizations in this buffer? ")) |
| 823 | (yes-or-no-p "Really erase all customizations in this buffer? ")) | 823 | (mapc (lambda (widget) |
| 824 | (mapc (lambda (widget) | 824 | (and (if (widget-get widget :custom-standard-value) |
| 825 | (and (if (widget-get widget :custom-standard-value) | 825 | (widget-apply widget :custom-standard-value) |
| 826 | (widget-apply widget :custom-standard-value) | 826 | t) |
| 827 | t) | 827 | (memq (widget-get widget :custom-state) |
| 828 | (memq (widget-get widget :custom-state) | 828 | '(modified set changed saved rogue)) |
| 829 | '(modified set changed saved rogue)) | 829 | (widget-apply widget :custom-reset-standard))) |
| 830 | (widget-apply widget :custom-reset-standard))) | 830 | children) |
| 831 | children))) | 831 | (message "Aborted")))) |
| 832 | (message "Aborted"))) | ||
| 833 | 832 | ||
| 834 | ;;; The Customize Commands | 833 | ;;; The Customize Commands |
| 835 | 834 | ||