[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118236: * fontset.c (toplevel): Adjust comment to m
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r118236: * fontset.c (toplevel): Adjust comment to match 2014-06-19 change. |
Date: |
Thu, 30 Oct 2014 11:12:33 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118236
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-30 14:12:21 +0300
message:
* fontset.c (toplevel): Adjust comment to match 2014-06-19 change.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/fontset.c fontset.c-20091113204419-o5vbwnq5f7feedwu-1079
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-10-30 09:37:08 +0000
+++ b/src/ChangeLog 2014-10-30 11:12:21 +0000
@@ -3,6 +3,8 @@
* xfaces.c (Finternal_set_lisp_face_attribute): Don't try to realize
font on an initial frame when running as a daemon (Bug#18869).
+ * fontset.c (toplevel): Adjust comment to match 2014-06-19 change.
+
2014-10-30 Eli Zaretskii <address@hidden>
* fileio.c (Fexpand_file_name): Use make_unibyte_string, not
=== modified file 'src/fontset.c'
--- a/src/fontset.c 2014-10-01 03:28:16 +0000
+++ b/src/fontset.c 2014-10-30 11:12:21 +0000
@@ -92,27 +92,28 @@
range of characters in this fontset, but may be available in the
default fontset.
-
- A fontset has 9 extra slots.
-
- The 1st slot: the ID number of the fontset
+ A fontset has 8 extra slots.
+
+ The 1st slot:
+ base: the ID number of the fontset
+ realized: Likewise
The 2nd slot:
base: the name of the fontset
realized: nil
The 3rd slot:
+ base: the font name for ASCII characters
+ realized: nil
+
+ The 4th slot:
base: nil
realized: the base fontset
- The 4th slot:
+ The 5th slot:
base: nil
realized: the frame that the fontset belongs to
- The 5th slot:
- base: the font name for ASCII characters
- realized: nil
-
The 6th slot:
base: nil
realized: the ID number of a face to use for characters that
@@ -120,15 +121,10 @@
The 7th slot:
base: nil
- realized: Alist of font index vs the corresponding repertory
- char-table.
+ realized: If the base is not the default fontset, a fontset
+ realized from the default fontset, else nil.
The 8th slot:
- base: nil
- realized: If the base is not the default fontset, a fontset
- realized from the default fontset, else nil.
-
- The 9th slot:
base: Same as element value (but for fallback fonts).
realized: Likewise.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118236: * fontset.c (toplevel): Adjust comment to match 2014-06-19 change.,
Dmitry Antipov <=