aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXue Fuqiao2013-10-24 21:53:20 +0800
committerXue Fuqiao2013-10-24 21:53:20 +0800
commit8b78f36c3a5b6ae010ca4d4d9d2df47cda9cbf4b (patch)
treea8f3e2d5ce6b8a3f34f531b2a3a3221c99370d4d
parent235bd03a9f2d4a58f34adea56b90055eecf3653c (diff)
downloademacs-8b78f36c3a5b6ae010ca4d4d9d2df47cda9cbf4b.tar.gz
emacs-8b78f36c3a5b6ae010ca4d4d9d2df47cda9cbf4b.zip
* doc/lispref/display.texi (Low-Level Font): Add an index for font registry.
-rw-r--r--doc/lispref/ChangeLog1
-rw-r--r--doc/lispref/display.texi1
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e0ce3d5e799..617bdab0cb5 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -2,6 +2,7 @@
2 2
3 * display.texi (Face Remapping): Add indexes for face remapping. 3 * display.texi (Face Remapping): Add indexes for face remapping.
4 (Font Selection): Add indexes for font selection. 4 (Font Selection): Add indexes for font selection.
5 (Low-Level Font): Add an index for font registry.
5 6
62013-10-23 Glenn Morris <rgm@gnu.org> 72013-10-23 Glenn Morris <rgm@gnu.org>
7 8
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 6f0d052dd6f..687bbae01d7 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3241,6 +3241,7 @@ size, or a floating point number that specifies the point size.
3241Additional typographic style information for the font, such as 3241Additional typographic style information for the font, such as
3242@samp{sans}. The value should be a string or a symbol. 3242@samp{sans}. The value should be a string or a symbol.
3243 3243
3244@cindex font registry
3244@item :registry 3245@item :registry
3245The charset registry and encoding of the font, such as 3246The charset registry and encoding of the font, such as
3246@samp{iso8859-1}. The value should be a string or a symbol. 3247@samp{iso8859-1}. The value should be a string or a symbol.