[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115371: * font.c (font_list_entities): Remove dummy
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r115371: * font.c (font_list_entities): Remove dummy assignment. |
Date: |
Wed, 04 Dec 2013 13:09:06 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115371
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-04 17:08:30 +0400
message:
* font.c (font_list_entities): Remove dummy assignment.
* font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are
used on graphic displays only. Remove unused 'font_encoder' member.
* nsfont.m (nsfont_open):
* w32font.c (w32font_open_internal): Adjust users.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/font.c font.c-20091113204419-o5vbwnq5f7feedwu-8540
src/font.h font.h-20091113204419-o5vbwnq5f7feedwu-8541
src/nsfont.m nsfont.m-20091113204419-o5vbwnq5f7feedwu-8748
src/w32font.c w32font.c-20091113204419-o5vbwnq5f7feedwu-8545
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-12-03 22:36:49 +0000
+++ b/src/ChangeLog 2013-12-04 13:08:30 +0000
@@ -1,3 +1,11 @@
+2013-12-04 Dmitry Antipov <address@hidden>
+
+ * font.c (font_list_entities): Remove dummy assignment.
+ * font.h (struct font) [HAVE_WINDOW_SYSTEM]: Group members which are
+ used on graphic displays only. Remove unused 'font_encoder' member.
+ * nsfont.m (nsfont_open):
+ * w32font.c (w32font_open_internal): Adjust users.
+
2013-12-03 Paul Eggert <address@hidden>
Use bool for boolean.
=== modified file 'src/font.c'
--- a/src/font.c 2013-10-29 16:11:50 +0000
+++ b/src/font.c 2013-12-04 13:08:30 +0000
@@ -2718,7 +2718,7 @@
ASET (scratch_font_spec, FONT_SPACING_INDEX, AREF (spec,
FONT_SPACING_INDEX));
ASET (scratch_font_spec, FONT_EXTRA_INDEX, AREF (spec, FONT_EXTRA_INDEX));
- for (i = 0; driver_list; driver_list = driver_list->next)
+ for (; driver_list; driver_list = driver_list->next)
if (driver_list->on
&& (NILP (ftype) || EQ (driver_list->driver->type, ftype)))
{
=== modified file 'src/font.h'
--- a/src/font.h 2013-12-02 13:35:53 +0000
+++ b/src/font.h 2013-12-04 13:08:30 +0000
@@ -312,6 +312,10 @@
/* Ascent and descent of the font (in pixels). */
int ascent, descent;
+ /* The following members makes sense on graphic displays only. */
+
+#if defined (HAVE_WINDOW_SYSTEM)
+
/* Vertical pixel width of the underline. If is zero if that
information is not in the font. */
int underline_thickness;
@@ -374,12 +378,6 @@
registered in char-table `use-default-ascent'. */
int default_ascent;
- /* CCL program to calculate code points of the font. */
- struct ccl_program *font_encoder;
-
- /* Font-driver for the font. */
- struct font_driver *driver;
-
/* Charset to encode a character code into a glyph code of the font.
-1 means that the font doesn't require this information to encode
a character. */
@@ -390,6 +388,11 @@
determine it. */
int repertory_charset;
+#endif /* HAVE_WINDOW_SYSTEM */
+
+ /* Font-driver for the font. */
+ struct font_driver *driver;
+
/* There are more members in this structure, but they are private
to the font-driver. */
};
=== modified file 'src/nsfont.m'
--- a/src/nsfont.m 2013-10-25 06:55:36 +0000
+++ b/src/nsfont.m 2013-12-04 13:08:30 +0000
@@ -829,7 +829,6 @@
font->vertical_centering = 0;
font->baseline_offset = 0;
font->relative_compose = 0;
- font->font_encoder = NULL;
font->props[FONT_FORMAT_INDEX] = Qns;
font->props[FONT_FILE_INDEX] = Qnil;
=== modified file 'src/w32font.c'
--- a/src/w32font.c 2013-11-29 11:01:45 +0000
+++ b/src/w32font.c 2013-12-04 13:08:30 +0000
@@ -1012,7 +1012,6 @@
font->baseline_offset = 0;
font->relative_compose = 0;
font->default_ascent = w32_font->metrics.tmAscent;
- font->font_encoder = NULL;
font->pixel_size = size;
font->driver = &w32font_driver;
/* Use format cached during list, as the information we have access to
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115371: * font.c (font_list_entities): Remove dummy assignment.,
Dmitry Antipov <=