From: Miles Bader <miles@gnu.org>
Date: Thu, 25 Apr 2002 15:39:32 +0000 (+0000)
Subject: (customize-face, customize-face-other-window):
X-Git-Tag: ttn-vms-21-2-B4~15410
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e16a803772f2f31b4dc7736730086c9f596a54e0;p=emacs.git

(customize-face, customize-face-other-window):
Use default instead of initial-input for suggested face.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 348ae701550..5d8cdb66090 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-26  Miles Bader  <miles@gnu.org>
+
+	* cus-edit.el (customize-face, customize-face-other-window):
+	Use default instead of initial-input for suggested face.
+
 2002-04-25  Gerd Moellmann  <gerd@gnu.org>
 
 	* cus-edit.el (customize-face-other-window, customize-face):
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 797d0d5b04c..9fcf1f4ee50 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1040,11 +1040,14 @@ If SYMBOL is nil, customize all faces.
 Interactively, when point is on text which has a face specified,
 suggest to customized that face, if it's customizable."
   (interactive
-   (list (completing-read "Customize face (default all): "
-			  obarray 'custom-facep t
-			  (let ((face (get-char-property (point) 'face)))
-			    (when (and face (symbolp face))
-			      (symbol-name face))))))
+   (list
+    (let ((face (get-char-property (point) 'face)))
+      (if (and face (symbolp face))
+	  (completing-read (format "Customize face (default `%s'): "
+				   (symbol-name face))
+			   obarray 'custom-facep t nil nil (symbol-name face))
+	(completing-read "Customize face (default all): "
+			 obarray 'custom-facep t)))))
   (if (or (null symbol) (and (stringp symbol) (zerop (length symbol))))
       (custom-buffer-create (custom-sort-items
 			     (mapcar (lambda (symbol)
@@ -1067,11 +1070,14 @@ suggest to customized that face, if it's customizable."
 Interactively, when point is on text which has a face specified,
 suggest to customized that face, if it's customizable."
   (interactive
-   (list (completing-read "Customize face: "
-			  obarray 'custom-facep t
-			  (let ((face (get-char-property (point) 'face)))
-			    (when (and face (symbolp face))
-			      (symbol-name face))))))
+   (list
+    (let ((face (get-char-property (point) 'face)))
+      (if (and face (symbolp face))
+	  (completing-read (format "Customize face (default `%s'): "
+				   (symbol-name face))
+			   obarray 'custom-facep t nil nil (symbol-name face))
+	(completing-read "Customize face (default all): "
+			 obarray 'custom-facep t)))))
   (if (or (null symbol) (and (stringp symbol) (zerop (length symbol))))
       ()
     (if (stringp symbol)