Mercurial > emacs
changeset 59795:ba8c5b54e390
(custom-bury-buffer): Function deleted.
(custom-buffer-done-function): Option deleted.
(custom-buffer-done-kill): New (replacement option.
(Custom-buffer-done): Call quit-window.
(custom-buffer-create-internal): Update for above changes.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 30 Jan 2005 11:07:54 +0000 |
| parents | d3e8b36d36d0 |
| children | 48aa868cde0b |
| files | lisp/cus-edit.el |
| diffstat | 1 files changed, 9 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/cus-edit.el Sun Jan 30 02:09:45 2005 +0000 +++ b/lisp/cus-edit.el Sun Jan 30 11:07:54 2005 +0000 @@ -1180,19 +1180,10 @@ (const links)) :group 'custom-buffer) -;; If we pass BUFFER to `bury-buffer', the buffer isn't removed from -;; the window. -(defun custom-bury-buffer (buffer) - (with-current-buffer buffer - (bury-buffer))) - -(defcustom custom-buffer-done-function 'custom-bury-buffer - "*Function called to remove a Custom buffer when the user is done with it. -Called with one argument, the buffer to remove." - :type '(choice (function-item :tag "Bury buffer" custom-bury-buffer) - (function-item :tag "Kill buffer" kill-buffer) - (function :tag "Other")) - :version "21.1" +(defcustom custom-buffer-done-kill nil + "*Non-nil means exiting a Custom buffer should kill it." + :type 'boolean + :version "21.4" :group 'custom-buffer) (defcustom custom-buffer-indent 3 @@ -1262,9 +1253,9 @@ :group 'custom-buffer) (defun Custom-buffer-done (&rest ignore) - "Remove current buffer by calling `custom-buffer-done-function'." + "Exit current Custom buffer according to `custom-buffer-done-kill'." (interactive) - (funcall custom-buffer-done-function (current-buffer))) + (quit-window custom-buffer-done-kill)) (defcustom custom-raised-buttons (not (equal (face-valid-attribute-values :box) '(("unspecified" . unspecified)))) @@ -1350,13 +1341,9 @@ :tag "Finish" :help-echo (lambda (&rest ignore) - (cond - ((eq custom-buffer-done-function - 'custom-bury-buffer) - "Bury this buffer") - ((eq custom-buffer-done-function 'kill-buffer) - "Kill this buffer") - (t "Finish with this buffer"))) + (if custom-buffer-done-kill + "Kill this buffer" + "Bury this buffer")) :action #'Custom-buffer-done) (widget-insert "\n\n") (message "Creating customization items...")