Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
23696fd7
Commit
23696fd7
authored
Aug 15, 2009
by
Chong Yidong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* display.texi (Face Attributes): Add xref to Displaying Faces for
explanation of "underlying face".
parent
485db0ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
8 deletions
+18
-8
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+3
-0
doc/lispref/display.texi
doc/lispref/display.texi
+15
-8
No files found.
doc/lispref/ChangeLog
View file @
23696fd7
2009-08-15 Chong Yidong <cyd@stupidchicken.com>
* 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
...
...
doc/lispref/display.texi
View file @
23696fd7
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment