diff options
author | Xue Fuqiao <xfq.free@gmail.com> | 2013-10-25 21:12:58 +0800 |
---|---|---|
committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-10-25 21:12:58 +0800 |
commit | 3e1300f765befac6ed9e7f59c022f5f886babfd5 (patch) | |
tree | 60d1c37d0149761eeec343a181cd562f3709bb65 /doc | |
parent | 2194b2a4b0425019ee80bb5a26673361cb059678 (diff) | |
download | emacs-3e1300f765befac6ed9e7f59c022f5f886babfd5.tar.gz |
* doc/lispref/display.texi (Low-Level Font): Improve indexing.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
-rw-r--r-- | doc/lispref/display.texi | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 367d5b25227..b0df928a3be 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,8 +1,9 @@ 2013-10-25 Xue Fuqiao <xfq.free@gmail.com> - * nonascii.texi (Character Properties): Add an index for script symbols. - * display.texi (Fontsets): Minor wording fix. + (Low-Level Font): Improve indexing. + + * nonascii.texi (Character Properties): Add an index for script symbols. 2013-10-24 Xue Fuqiao <xfq.free@gmail.com> diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 425c69a691e..b4e9baf877f 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -3199,6 +3199,7 @@ should be one of @code{font-object}, @code{font-spec}, or @code{font-entity}. @end defun +@cindex font object A font object is a Lisp object that represents a font that Emacs has @dfn{opened}. Font objects cannot be modified in Lisp, but they can be inspected. @@ -3212,6 +3213,7 @@ otherwise, @var{string} should be a string, and @var{position} specifies a position in that string. @end defun +@cindex font spec A font spec is a Lisp object that contains a set of specifications that can be used to find a font. More than one font may match the specifications in a font spec. @@ -3277,6 +3279,7 @@ Set the font property @var{property} in the font-spec @var{font-spec} to @var{value}. @end defun +@cindex font entity A font entity is a reference to a font that need not be open. Its properties are intermediate between a font object and a font spec: like a font object, and unlike a font spec, it refers to a single, |