summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2015-06-15 20:14:11 +0300
committerEli Zaretskii <eliz@gnu.org>2015-06-15 20:14:11 +0300
commitf0f216eaa1ebc84457812f66a5e714721245ef9d (patch)
treeb1374ce6765aec4c8daf83b1413841fd2154847e
parentee715b9f6d9fccf4415a21a756058a60c924bc27 (diff)
downloademacs-f0f216eaa1ebc84457812f66a5e714721245ef9d.tar.gz
;* src/fontset.c: Update obsolete commentary.
-rw-r--r--src/fontset.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/fontset.c b/src/fontset.c
index f1a3e597409..50fcc648548 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -66,16 +66,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
A fontset object is implemented by a char-table whose default value
and parent are always nil.
- An element of a base fontset is a vector of FONT-DEFs which itself
- is a vector [ FONT-SPEC ENCODING REPERTORY ].
+ An element of a base fontset is a vector of FONT-DEFs which themselves
+ are vectors of the form [ FONT-SPEC ENCODING REPERTORY ].
An element of a realized fontset is nil, t, 0, or a vector of this
form:
- [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF
- RFONT-DEF0 RFONT-DEF1 ... ]
+ [ PREFERRED-RFONT-DEF RFONT-DEF0 RFONT-DEF1 ... ]
- RFONT-DEFn (i.e. Realized FONT-DEF) has this form:
+ Each RFONT-DEFn (i.e. Realized FONT-DEF) has this form:
[ FACE-ID FONT-DEF FONT-OBJECT SORTING-SCORE ]
@@ -370,14 +369,12 @@ fontset_compare_rfontdef (const void *val1, const void *val2)
- RFONT_DEF_SCORE (*(Lisp_Object *) val2));
}
-/* Update FONT-GROUP which has this form:
- [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF
- RFONT-DEF0 RFONT-DEF1 ... ]
+/* Update a cons cell which has this form:
+ (CHARSET-ORDERED-LIST-TICK . FONT-GROUP)
+ where FONT-GROUP is of the form
+ [ PREFERRED-RFONT-DEF RFONT-DEF0 RFONT-DEF1 ... ]
Reorder RFONT-DEFs according to the current language, and update
- CHARSET-ORDERED-LIST-TICK.
-
- If PREFERRED_FAMILY is not nil, that family has the higher priority
- if the encoding charsets or languages in font-specs are the same. */
+ CHARSET-ORDERED-LIST-TICK. */
static void
reorder_font_vector (Lisp_Object font_group, struct font *font)