From 23696fd7bd746d4fb7179f318de31668acd1bfe7 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 15 Aug 2009 21:08:36 +0000 Subject: [PATCH] * display.texi (Face Attributes): Add xref to Displaying Faces for explanation of "underlying face". --- doc/lispref/ChangeLog | 3 +++ doc/lispref/display.texi | 23 +++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9ab5b15b4bc..f6ed748fdd0 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,5 +1,8 @@ 2009-08-15 Chong Yidong + * 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 diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 14e6a79c5f0..a2990858c8c 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -2020,12 +2020,18 @@ set width. This should be one of the symbols @code{ultra-condensed}, @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 +@ref{Displaying 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 @@ this attribute also changes the values of the @code{:family}, 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 -- 2.39.2