[Emacs-diffs] emacs/doc/lispref ChangeLog display.texi

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/15 21:08:36

Modified files:
        doc/lispref    : ChangeLog display.texi 

Log message:
        * display.texi (Face Attributes): Add xref to Displaying Faces for
        explanation of "underlying face".

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/ChangeLog?cvsroot=emacs&r1=1.314&r2=1.315
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/display.texi?cvsroot=emacs&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -b -r1.314 -r1.315
--- ChangeLog   15 Aug 2009 17:59:40 -0000      1.314
+++ ChangeLog   15 Aug 2009 21:08:36 -0000      1.315
@@ -1,5 +1,8 @@
 2009-08-15  Chong Yidong  <address@hidden>
 
+       * display.texi (Face Attributes): Add xref to Displaying Faces for
+       explanation of "underlying face".
+
        * customize.texi (Common Keywords): Add xref to Loading.
 
        * loading.texi (How Programs Do Loading): Add xref to Lisp

Index: display.texi
===================================================================
RCS file: /sources/emacs/emacs/doc/lispref/display.texi,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- display.texi        10 Jul 2009 04:58:56 -0000      1.48
+++ display.texi        15 Aug 2009 21:08:36 -0000      1.49
@@ -2020,12 +2020,18 @@
 @code{extra-expanded}, or @code{ultra-expanded}.
 
 @item :height
-Font height---either an integer in units of 1/10 point, or a floating
-point number specifying the amount by which to scale the height of any
-underlying face, or a function that is called with one argument (the
-height of the underlying face) and returns the height of the new face.
-If the function is passed an integer argument, it must return an
-integer.
+The height of the font.  In the simplest case, this is an integer in
+units of 1/10 point.
+
+The value can also be a floating point number or a function, which
+specifies the height relative to an @dfn{underlying face} (i.e., a
+face that has a lower priority in the list described in
address@hidden Faces}).  If the value is a floating point number,
+that specifies the amount by which to scale the height of the
+underlying face.  If the value is a function, that function is called
+with one argument, the height of the underlying face, and returns the
+height of the new face.  If the function is passed an integer
+argument, it must return an integer.
 
 The height of the default face must be specified using an integer;
 floating point and function values are not allowed.
@@ -2143,8 +2149,9 @@
 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
 an underlying face would be, with higher priority than underlying
-faces.  If a list of faces is used, attributes from faces earlier in
-the list override those from later faces.
+faces (@pxref{Displaying Faces}).  If a list of faces is used,
+attributes from faces earlier in the list override those from later
+faces.
 @end table
 
 For compatibility with Emacs 20, you can also specify values for two