aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2015-06-15 20:14:11 +0300
committerEli Zaretskii2015-06-15 20:14:11 +0300
commitf0f216eaa1ebc84457812f66a5e714721245ef9d (patch)
treeb1374ce6765aec4c8daf83b1413841fd2154847e
parentee715b9f6d9fccf4415a21a756058a60c924bc27 (diff)
downloademacs-f0f216eaa1ebc84457812f66a5e714721245ef9d.tar.gz
emacs-f0f216eaa1ebc84457812f66a5e714721245ef9d.zip
;* 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/>. */
66 A fontset object is implemented by a char-table whose default value 66 A fontset object is implemented by a char-table whose default value
67 and parent are always nil. 67 and parent are always nil.
68 68
69 An element of a base fontset is a vector of FONT-DEFs which itself 69 An element of a base fontset is a vector of FONT-DEFs which themselves
70 is a vector [ FONT-SPEC ENCODING REPERTORY ]. 70 are vectors of the form [ FONT-SPEC ENCODING REPERTORY ].
71 71
72 An element of a realized fontset is nil, t, 0, or a vector of this 72 An element of a realized fontset is nil, t, 0, or a vector of this
73 form: 73 form:
74 74
75 [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF 75 [ PREFERRED-RFONT-DEF RFONT-DEF0 RFONT-DEF1 ... ]
76 RFONT-DEF0 RFONT-DEF1 ... ]
77 76
78 RFONT-DEFn (i.e. Realized FONT-DEF) has this form: 77 Each RFONT-DEFn (i.e. Realized FONT-DEF) has this form:
79 78
80 [ FACE-ID FONT-DEF FONT-OBJECT SORTING-SCORE ] 79 [ FACE-ID FONT-DEF FONT-OBJECT SORTING-SCORE ]
81 80
@@ -370,14 +369,12 @@ fontset_compare_rfontdef (const void *val1, const void *val2)
370 - RFONT_DEF_SCORE (*(Lisp_Object *) val2)); 369 - RFONT_DEF_SCORE (*(Lisp_Object *) val2));
371} 370}
372 371
373/* Update FONT-GROUP which has this form: 372/* Update a cons cell which has this form:
374 [ CHARSET-ORDERED-LIST-TICK PREFERRED-RFONT-DEF 373 (CHARSET-ORDERED-LIST-TICK . FONT-GROUP)
375 RFONT-DEF0 RFONT-DEF1 ... ] 374 where FONT-GROUP is of the form
375 [ PREFERRED-RFONT-DEF RFONT-DEF0 RFONT-DEF1 ... ]
376 Reorder RFONT-DEFs according to the current language, and update 376 Reorder RFONT-DEFs according to the current language, and update
377 CHARSET-ORDERED-LIST-TICK. 377 CHARSET-ORDERED-LIST-TICK. */
378
379 If PREFERRED_FAMILY is not nil, that family has the higher priority
380 if the encoding charsets or languages in font-specs are the same. */
381 378
382static void 379static void
383reorder_font_vector (Lisp_Object font_group, struct font *font) 380reorder_font_vector (Lisp_Object font_group, struct font *font)