[Emacs-diffs] Changes to emacs/lisp/cus-edit.el

[Richard M . Stallman]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.208 emacs/lisp/cus-edit.el:1.209
*** emacs/lisp/cus-edit.el:1.208        Fri Jan 28 18:55:14 2005
--- emacs/lisp/cus-edit.el      Sun Jan 30 11:07:54 2005
***************
*** 1180,1198 ****
                (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"
    :group 'custom-buffer)
  
  (defcustom custom-buffer-indent 3
--- 1180,1189 ----
                (const links))
    :group 'custom-buffer)
  
! (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,1270 ****
    :group 'custom-buffer)
  
  (defun Custom-buffer-done (&rest ignore)
!   "Remove current buffer by calling `custom-buffer-done-function'."
    (interactive)
!   (funcall custom-buffer-done-function (current-buffer)))
  
  (defcustom custom-raised-buttons (not (equal (face-valid-attribute-values 
:box)
                                             '(("unspecified" . unspecified))))
--- 1253,1261 ----
    :group 'custom-buffer)
  
  (defun Custom-buffer-done (&rest ignore)
!   "Exit current Custom buffer according to `custom-buffer-done-kill'."
    (interactive)
!   (quit-window custom-buffer-done-kill))
  
  (defcustom custom-raised-buttons (not (equal (face-valid-attribute-values 
:box)
                                             '(("unspecified" . unspecified))))
***************
*** 1350,1362 ****
                 :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")))
                 :action #'Custom-buffer-done)
    (widget-insert "\n\n")
    (message "Creating customization items...")
--- 1341,1349 ----
                 :tag "Finish"
                 :help-echo
                 (lambda (&rest ignore)
!                  (if custom-buffer-done-kill
!                      "Kill this buffer"
!                    "Bury this buffer"))
                 :action #'Custom-buffer-done)
    (widget-insert "\n\n")
    (message "Creating customization items...")