From 8d8ca350e75f1964f9a3454aa783726d02c0871b Mon Sep 17 00:00:00 2001 From: Dave Love Date: Mon, 15 Nov 1999 12:36:02 +0000 Subject: [PATCH] (customize-face, customize-face-other-window): Require match from completing-read. (custom-buffer-done-function): Default to custom-bury-buffer, not bury-buffer. --- lisp/ChangeLog | 7 +++++++ lisp/cus-edit.el | 16 +++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49695b78452..2e7f66f59f3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +1999-11-15 Dave Love + + * cus-edit.el (customize-face, customize-face-other-window): + Require match from completing-read. + (custom-buffer-done-function): Default to custom-bury-buffer, not + bury-buffer. + 1999-11-15 Gerd Moellmann * hippie-exp.el: Use new backquote syntax. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 5f876b66dce..cb6e8282038 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1021,7 +1021,7 @@ Show the buffer in another window, but don't select it." "Customize SYMBOL, which should be a face name or nil. If SYMBOL is nil, customize all faces." (interactive (list (completing-read "Customize face: (default all) " - obarray 'custom-facep))) + obarray 'custom-facep t))) (if (or (null symbol) (and (stringp symbol) (zerop (length symbol)))) (custom-buffer-create (custom-sort-items (mapcar (lambda (symbol) @@ -1041,7 +1041,7 @@ If SYMBOL is nil, customize all faces." (defun customize-face-other-window (&optional symbol) "Show customization buffer for FACE in other window." (interactive (list (completing-read "Customize face: " - obarray 'custom-facep))) + obarray 'custom-facep t))) (if (or (null symbol) (and (stringp symbol) (zerop (length symbol)))) () (if (stringp symbol) @@ -1153,14 +1153,16 @@ links: groups have links to subgroups." (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) (bury-buffer)) -(defcustom custom-buffer-done-function '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 custom-bury-buffer) - (function-item kill-buffer) + :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) @@ -3546,7 +3548,7 @@ Leave point at the location of the call, or after the last expression." ':style 'toggle ':selected symbol))) -;; Fixme: sort out use of :filter in Emacs +;; Fixme: sort out use of :filter in Emacs 21. (if nil ; (string-match "XEmacs" emacs-version) ;; XEmacs can create menus dynamically. (defun custom-group-menu-create (widget symbol) @@ -3596,7 +3598,7 @@ Otherwise the menu will be named `Customize'. The format is suitable for use with `easy-menu-define'." (unless name (setq name "Customize")) - ;; Fixme: sort out use of :filter in Emacs + ;; Fixme: sort out use of :filter in Emacs 21. (if nil ;(string-match "XEmacs" emacs-version) ;; We can delay it under XEmacs. `(,name -- 2.39.5