aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/faces.el4
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed0a9ed25e8..37cbe9e71a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12007-10-09 Juanma Barranquero <lekktu@gmail.com> 12007-10-09 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * faces.el (face-font-selection-order): Doc fix.
4
3 * follow.el (follow-mode-hook, follow-mode): Doc fixes. 5 * follow.el (follow-mode-hook, follow-mode): Doc fixes.
4 (follow-mode-off-hook): Mark as obsolete. 6 (follow-mode-off-hook): Mark as obsolete.
5 7
diff --git a/lisp/faces.el b/lisp/faces.el
index daf5f39fbc1..3df4f7c82aa 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -48,8 +48,8 @@
48 "*A list specifying how face font selection chooses fonts. 48 "*A list specifying how face font selection chooses fonts.
49Each of the four symbols `:width', `:height', `:weight', and `:slant' 49Each of the four symbols `:width', `:height', `:weight', and `:slant'
50must appear once in the list, and the list must not contain any other 50must appear once in the list, and the list must not contain any other
51elements. Font selection tries to find a best matching font for 51elements. Font selection tries to find first a best matching font
52those face attributes first that appear first in the list. For 52for those face attributes that appear before in the list. For
53example, if `:slant' appears before `:height', font selection first 53example, if `:slant' appears before `:height', font selection first
54tries to find a font with a suitable slant, even if this results in 54tries to find a font with a suitable slant, even if this results in
55a font height that isn't optimal." 55a font height that isn't optimal."