[Emacs-diffs] trunk r116331: * display.texi (Face Attributes): Add an index.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 116331
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14924
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 21:32:54 -0800
message:
  * display.texi (Face Attributes): Add an index.
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/display.texi       
display.texi-20091113204419-o5vbwnq5f7feedwu-6172

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2014-02-08 03:46:53 +0000
+++ b/doc/lispref/ChangeLog     2014-02-08 05:32:54 +0000
@@ -1,5 +1,7 @@
 2014-02-08  Lars Ingebrigtsen  <address@hidden>
 
+       * display.texi (Face Attributes): Add an index (bug#14924).
+
        * keymaps.texi (Menu Bar): Minor clarification (bug#15657).
 
 2014-02-06  Glenn Morris  <address@hidden>

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2014-02-06 04:27:26 +0000
+++ b/doc/lispref/display.texi  2014-02-08 05:32:54 +0000
@@ -2169,6 +2169,7 @@
 the values of the @code{:family}, @code{:foundry}, @code{:width},
 @code{:height}, @code{:weight}, and @code{:slant} attributes.
 
address@hidden 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