From 7d6beba3f897626b17589fbf533da132ef8b0eac Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Fri, 7 Feb 2014 21:32:54 -0800 Subject: [PATCH] * display.texi (Face Attributes): Add an index. --- doc/lispref/ChangeLog | 2 ++ doc/lispref/display.texi | 1 + 2 files changed, 3 insertions(+) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index acec501adb0..95de790dda6 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 -- 2.11.4.GIT