From: Dmitry Antipov <dmantipov@yandex.ru>
Date: Thu, 30 Oct 2014 11:12:21 +0000 (+0300)
Subject: * fontset.c (toplevel): Adjust comment to match 2014-06-19 change.
X-Git-Tag: emacs-25.0.90~2635^2~620
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ff7ec46d34fa2371ca22b046d1b8654c88dc24db;p=emacs.git

* fontset.c (toplevel): Adjust comment to match 2014-06-19 change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cb13ffa8dd8..6e2e55fa570 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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  <eliz@gnu.org>
 
 	* fileio.c (Fexpand_file_name): Use make_unibyte_string, not
diff --git a/src/fontset.c b/src/fontset.c
index c415fdfa8fd..d08d68fa28d 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -92,26 +92,27 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    range of characters in this fontset, but may be available in the
    default fontset.
 
+   A fontset has 8 extra slots.
 
-   A fontset has 9 extra slots.
-
-   The 1st slot: the ID number of the fontset
+   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: nil
-	realized: the base fontset
+	base: the font name for ASCII characters
+	realized: nil
 
    The 4th slot:
 	base: nil
-	realized: the frame that the fontset belongs to
+	realized: the base fontset
 
    The 5th slot:
-	base: the font name for ASCII characters
-	realized: nil
+	base: nil
+	realized: the frame that the fontset belongs to
 
    The 6th slot:
 	base: nil
@@ -119,16 +120,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 		  has no font in a realized fontset.
 
    The 7th slot:
-	base: nil
-	realized: Alist of font index vs the corresponding repertory
-	char-table.
-
-   The 8th slot:
 	base: nil
 	realized: If the base is not the default fontset, a fontset
-	realized from the default fontset, else nil.
+		  realized from the default fontset, else nil.
 
-   The 9th slot:
+   The 8th slot:
 	base: Same as element value (but for fallback fonts).
 	realized: Likewise.