aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-10-29 18:40:23 +0000
committerEli Zaretskii2001-10-29 18:40:23 +0000
commit95125512c27626bb3a881ab692a382dbea26d5a5 (patch)
treea32434a0b66f9b1665dde32a86d5285bc8034d12
parente76ecac5afdb8b8519db3eefbf45d889ab7a131e (diff)
downloademacs-95125512c27626bb3a881ab692a382dbea26d5a5.tar.gz
emacs-95125512c27626bb3a881ab692a382dbea26d5a5.zip
(read-face-name): Doc fix.
(make-face-bold, make-face-unbold, make-face-italic) (make-face-unitalic, make-face-bold-italic, invert-face): Remove trailing blank from the prompt passed to read-face-name.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/faces.el13
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a888ca75de..5c9b4ac6e98 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,10 @@
3 * faces.el (invert-face): Check for 'unspecified, not for nil, 3 * faces.el (invert-face): Check for 'unspecified, not for nil,
4 when testing whether face colors are not specified. From 4 when testing whether face colors are not specified. From
5 David.Kastrup@t-online.de (David Kastrup). 5 David.Kastrup@t-online.de (David Kastrup).
6 (read-face-name): Doc fix.
7 (make-face-bold, make-face-unbold, make-face-italic)
8 (make-face-unitalic, make-face-bold-italic, invert-face): Remove
9 trailing blank from the prompt passed to read-face-name.
6 10
72001-10-29 Sam Steingold <sds@gnu.org> 112001-10-29 Sam Steingold <sds@gnu.org>
8 12
diff --git a/lisp/faces.el b/lisp/faces.el
index ac9b6645ae0..d60d30a46f6 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -679,7 +679,7 @@ like an underlying face would be, with higher priority than underlying faces."
679FRAME nil or not specified means change face on all frames. 679FRAME nil or not specified means change face on all frames.
680Argument NOERROR is ignored and retained for compatibility. 680Argument NOERROR is ignored and retained for compatibility.
681Use `set-face-attribute' for finer control of the font weight." 681Use `set-face-attribute' for finer control of the font weight."
682 (interactive (list (read-face-name "Make which face bold "))) 682 (interactive (list (read-face-name "Make which face bold")))
683 (set-face-attribute face frame :weight 'bold)) 683 (set-face-attribute face frame :weight 'bold))
684 684
685 685
@@ -687,7 +687,7 @@ Use `set-face-attribute' for finer control of the font weight."
687 "Make the font of FACE be non-bold, if possible. 687 "Make the font of FACE be non-bold, if possible.
688FRAME nil or not specified means change face on all frames. 688FRAME nil or not specified means change face on all frames.
689Argument NOERROR is ignored and retained for compatibility." 689Argument NOERROR is ignored and retained for compatibility."
690 (interactive (list (read-face-name "Make which face non-bold "))) 690 (interactive (list (read-face-name "Make which face non-bold")))
691 (set-face-attribute face frame :weight 'normal)) 691 (set-face-attribute face frame :weight 'normal))
692 692
693 693
@@ -696,7 +696,7 @@ Argument NOERROR is ignored and retained for compatibility."
696FRAME nil or not specified means change face on all frames. 696FRAME nil or not specified means change face on all frames.
697Argument NOERROR is ignored and retained for compatibility. 697Argument NOERROR is ignored and retained for compatibility.
698Use `set-face-attribute' for finer control of the font slant." 698Use `set-face-attribute' for finer control of the font slant."
699 (interactive (list (read-face-name "Make which face italic "))) 699 (interactive (list (read-face-name "Make which face italic")))
700 (set-face-attribute face frame :slant 'italic)) 700 (set-face-attribute face frame :slant 'italic))
701 701
702 702
@@ -704,7 +704,7 @@ Use `set-face-attribute' for finer control of the font slant."
704 "Make the font of FACE be non-italic, if possible. 704 "Make the font of FACE be non-italic, if possible.
705FRAME nil or not specified means change face on all frames. 705FRAME nil or not specified means change face on all frames.
706Argument NOERROR is ignored and retained for compatibility." 706Argument NOERROR is ignored and retained for compatibility."
707 (interactive (list (read-face-name "Make which face non-italic "))) 707 (interactive (list (read-face-name "Make which face non-italic")))
708 (set-face-attribute face frame :slant 'normal)) 708 (set-face-attribute face frame :slant 'normal))
709 709
710 710
@@ -713,7 +713,7 @@ Argument NOERROR is ignored and retained for compatibility."
713FRAME nil or not specified means change face on all frames. 713FRAME nil or not specified means change face on all frames.
714Argument NOERROR is ignored and retained for compatibility. 714Argument NOERROR is ignored and retained for compatibility.
715Use `set-face-attribute' for finer control of font weight and slant." 715Use `set-face-attribute' for finer control of font weight and slant."
716 (interactive (list (read-face-name "Make which face bold-italic: "))) 716 (interactive (list (read-face-name "Make which face bold-italic")))
717 (set-face-attribute face frame :weight 'bold :slant 'italic)) 717 (set-face-attribute face frame :weight 'bold :slant 'italic))
718 718
719 719
@@ -828,7 +828,7 @@ If FRAME is omitted or nil, it means change face on all frames.
828If FACE specifies neither foreground nor background color, 828If FACE specifies neither foreground nor background color,
829set its foreground and background to the background and foreground 829set its foreground and background to the background and foreground
830of the default face. Value is FACE." 830of the default face. Value is FACE."
831 (interactive (list (read-face-name "Invert face "))) 831 (interactive (list (read-face-name "Invert face")))
832 (let ((fg (face-attribute face :foreground frame)) 832 (let ((fg (face-attribute face :foreground frame))
833 (bg (face-attribute face :background frame))) 833 (bg (face-attribute face :background frame)))
834 (if (not (and (eq fg 'unspecified) (eq bg 'unspecified))) 834 (if (not (and (eq fg 'unspecified) (eq bg 'unspecified)))
@@ -847,6 +847,7 @@ of the default face. Value is FACE."
847 847
848(defun read-face-name (prompt) 848(defun read-face-name (prompt)
849 "Read and return a face symbol, prompting with PROMPT. 849 "Read and return a face symbol, prompting with PROMPT.
850PROMPT should not end with a blank, since this function appends one.
850Value is a symbol naming a known face." 851Value is a symbol naming a known face."
851 (let ((face-list (mapcar #'(lambda (x) (cons (symbol-name x) x)) 852 (let ((face-list (mapcar #'(lambda (x) (cons (symbol-name x) x))
852 (face-list))) 853 (face-list)))