(customize-face, customize-face-other-window):

Use default instead of initial-input for suggested face.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 348ae7015504ecd22043d44747747961c5da496f..5d8cdb660901acfad17667bec90c36c6732d2649 100644 (file)
--- 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 797d0d5b04c8a3baa86648597435de223d007340..9fcf1f4ee502449707a5faeb74531fea9edf5eba 100644 (file)
--- 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)