aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-07 21:32:54 -0800
committerLars Ingebrigtsen2014-02-07 21:32:54 -0800
commit241781b6fa4c3e6bbb2f64e7886e6ad8f53cf146 (patch)
tree9d9d07ac48fcc4b685db2cfdec733566498eb367
parentdd7aafbbf013a3153dd092889a10f00baa2f18ed (diff)
downloademacs-241781b6fa4c3e6bbb2f64e7886e6ad8f53cf146.tar.gz
emacs-241781b6fa4c3e6bbb2f64e7886e6ad8f53cf146.zip
* display.texi (Face Attributes): Add an index.
Fixes: debbugs:14924
-rw-r--r--doc/lispref/ChangeLog2
-rw-r--r--doc/lispref/display.texi1
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 139e20a6189..da7709d354e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,7 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * display.texi (Face Attributes): Add an index (bug#14924).
4
3 * keymaps.texi (Menu Bar): Minor clarification (bug#15657). 5 * keymaps.texi (Menu Bar): Minor clarification (bug#15657).
4 6
52014-02-06 Glenn Morris <rgm@gnu.org> 72014-02-06 Glenn Morris <rgm@gnu.org>
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 7d52ad7207b..4297ba22451 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2169,6 +2169,7 @@ font matching those wildcards. Specifying this attribute also changes
2169the values of the @code{:family}, @code{:foundry}, @code{:width}, 2169the values of the @code{:family}, @code{:foundry}, @code{:width},
2170@code{:height}, @code{:weight}, and @code{:slant} attributes. 2170@code{:height}, @code{:weight}, and @code{:slant} attributes.
2171 2171
2172@cindex inheritance, for faces
2172@item :inherit 2173@item :inherit
2173The name of a face from which to inherit attributes, or a list of face 2174The name of a face from which to inherit attributes, or a list of face
2174names. Attributes from inherited faces are merged into the face like 2175names. Attributes from inherited faces are merged into the face like