aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2002-04-27 04:57:44 +0000
committerMiles Bader2002-04-27 04:57:44 +0000
commit3b4ef34b2e4005d8a512a53e6dc28ee371b64f4b (patch)
tree742822286144969bd0239eb9998da11403f53bfc
parent3fad47d896a4094bd33a2e012232948161a4eb12 (diff)
downloademacs-3b4ef34b2e4005d8a512a53e6dc28ee371b64f4b.tar.gz
emacs-3b4ef34b2e4005d8a512a53e6dc28ee371b64f4b.zip
(read-face-name): Format the prompt correctly when there's no default.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/faces.el4
2 files changed, 6 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7721b87f3d1..bc9baeb74fe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12002-04-27 Miles Bader <miles@gnu.org>
2
3 * faces.el (read-face-name): Format the prompt correctly when
4 there's no default.
5
12002-04-26 Andrew Choi <akochoi@shaw.ca> 62002-04-26 Andrew Choi <akochoi@shaw.ca>
2 7
3 * term/mac-win.el: Don't call ediff-toggle-multiframe. Set 8 * term/mac-win.el: Don't call ediff-toggle-multiframe. Set
diff --git a/lisp/faces.el b/lisp/faces.el
index 7b0381992cf..e4002246148 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -879,7 +879,7 @@ Otherwise, return a single face."
879 (format "%s (default %s): " prompt 879 (format "%s (default %s): " prompt
880 (if faces (mapconcat 'symbol-name faces ", ") 880 (if faces (mapconcat 'symbol-name faces ", ")
881 string-describing-default)) 881 string-describing-default))
882 prompt) 882 (format "%s: " prompt))
883 obarray 'custom-facep t)) 883 obarray 'custom-facep t))
884 ;; Canonicalize the output. 884 ;; Canonicalize the output.
885 (output 885 (output
@@ -894,8 +894,6 @@ Otherwise, return a single face."
894 (car output))))) 894 (car output)))))
895 895
896 896
897
898
899(defun face-valid-attribute-values (attribute &optional frame) 897(defun face-valid-attribute-values (attribute &optional frame)
900 "Return valid values for face attribute ATTRIBUTE. 898 "Return valid values for face attribute ATTRIBUTE.
901The optional argument FRAME is used to determine available fonts 899The optional argument FRAME is used to determine available fonts