aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-07-11 12:07:38 -0400
committerChong Yidong2010-07-11 12:07:38 -0400
commit635c0aa1a5ef0972b0175e57f985128bd2d9b302 (patch)
tree2dabafc9f6e77e7d2187357b3f90548c0ab25760
parent4ea6cb0a6265ccf7259f9a37e89a66b0243460cc (diff)
downloademacs-635c0aa1a5ef0972b0175e57f985128bd2d9b302.tar.gz
emacs-635c0aa1a5ef0972b0175e57f985128bd2d9b302.zip
* src/xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfaces.c14
2 files changed, 13 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 451dac369c9..4b3726147cb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-07-11 Chong Yidong <cyd@stupidchicken.com>
2
3 * xfaces.c (Vface_remapping_alist): Doc fix (Bug#6091).
4
12010-07-11 Andreas Schwab <schwab@linux-m68k.org> 52010-07-11 Andreas Schwab <schwab@linux-m68k.org>
2 6
3 * callint.c (Fcall_interactively): Use strchr, strrchr instead of 7 * callint.c (Fcall_interactively): Use strchr, strrchr instead of
diff --git a/src/xfaces.c b/src/xfaces.c
index 6848e7f95dc..ad436f06202 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6791,10 +6791,10 @@ Each element is of the form:
6791 (FACE REPLACEMENT...), 6791 (FACE REPLACEMENT...),
6792 6792
6793which causes display of the face FACE to use REPLACEMENT... instead. 6793which causes display of the face FACE to use REPLACEMENT... instead.
6794REPLACEMENT... is interpreted the same way the value of a `face' text 6794REPLACEMENT... is interpreted the same way as the value of a `face'
6795property is: it may be (1) A face name, (2) A list of face names, (3) A 6795text property: it may be (1) A face name, (2) A list of face names,
6796property-list of face attribute/value pairs, or (4) A list of face names 6796(3) A property-list of face attribute/value pairs, or (4) A list of
6797intermixed with lists containing face attribute/value pairs. 6797face names or lists containing face attribute/value pairs.
6798 6798
6799Multiple entries in REPLACEMENT... are merged together to form the final 6799Multiple entries in REPLACEMENT... are merged together to form the final
6800result, with faces or attributes earlier in the list taking precedence 6800result, with faces or attributes earlier in the list taking precedence
@@ -6818,7 +6818,11 @@ face definitions. For instance, the mode my-mode could define a face
6818`my-mode-default', and then in the mode setup function, do: 6818`my-mode-default', and then in the mode setup function, do:
6819 6819
6820 (set (make-local-variable 'face-remapping-alist) 6820 (set (make-local-variable 'face-remapping-alist)
6821 '((default my-mode-default)))). */); 6821 '((default my-mode-default)))).
6822
6823Because Emacs normally only redraws screen areas when the underlying
6824buffer contents change, you may need to call `redraw-display' after
6825changing this variable for it to take effect. */);
6822 Vface_remapping_alist = Qnil; 6826 Vface_remapping_alist = Qnil;
6823 6827
6824 DEFVAR_LISP ("face-font-rescale-alist", &Vface_font_rescale_alist, 6828 DEFVAR_LISP ("face-font-rescale-alist", &Vface_font_rescale_alist,