From: Lars Ingebrigtsen Date: Sat, 8 Feb 2014 05:32:54 +0000 (-0800) Subject: * display.texi (Face Attributes): Add an index. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~105 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=241781b6fa4c3e6bbb2f64e7886e6ad8f53cf146;p=emacs.git * display.texi (Face Attributes): Add an index. Fixes: debbugs:14924 --- 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 @@ 2014-02-08 Lars Ingebrigtsen + * display.texi (Face Attributes): Add an index (bug#14924). + * keymaps.texi (Menu Bar): Minor clarification (bug#15657). 2014-02-06 Glenn Morris 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 the values of the @code{:family}, @code{:foundry}, @code{:width}, @code{:height}, @code{:weight}, and @code{:slant} attributes. +@cindex inheritance, for faces @item :inherit The name of a face from which to inherit attributes, or a list of face names. Attributes from inherited faces are merged into the face like