[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111600: * font.c (num_fonts): Remove
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111600: * font.c (num_fonts): Remove the leftover from old |
Date: |
Fri, 25 Jan 2013 10:31:41 +0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111600
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-01-25 10:31:41 +0400
message:
* font.c (num_fonts): Remove the leftover from old
debugging code. Adjust comment style here and there.
modified:
src/ChangeLog
src/font.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-01-25 04:41:39 +0000
+++ b/src/ChangeLog 2013-01-25 06:31:41 +0000
@@ -1,3 +1,8 @@
+2013-01-25 Dmitry Antipov <address@hidden>
+
+ * font.c (num_fonts): Remove the leftover from old
+ debugging code. Adjust comment style here and there.
+
2013-01-25 Eli Zaretskii <address@hidden>
* w32.c (max_filename_mbslen): New function.
@@ -36,7 +41,7 @@
(w32_read_socket): Save iconified state to generate DEICONIFY_EVENT
properly. Likewise for obscured.
* xterm.c: Ditto.
- (handle_one_xevent): Save visible state go generate ICONIFY_EVENT
+ (handle_one_xevent): Save visible state to generate ICONIFY_EVENT
properly.
* nsterm.m: Ditto.
(windowDidDeminiaturize): Generate DEICONIFY_EVENT.
=== modified file 'src/font.c'
--- a/src/font.c 2013-01-17 06:29:40 +0000
+++ b/src/font.c 2013-01-25 06:31:41 +0000
@@ -717,7 +717,7 @@
}
-/* Font name parser and unparser */
+/* Font name parser and unparser. */
static int parse_matrix (const char *);
static int font_expand_wildcards (Lisp_Object *, int);
@@ -1746,7 +1746,7 @@
/* This part (through the next ^L) is still experimental and not
tested much. We may drastically change codes. */
-/* OTF handler */
+/* OTF handler. */
#if 0
@@ -2035,7 +2035,7 @@
#endif /* 0 */
-/* Font sorting */
+/* Font sorting. */
static unsigned font_score (Lisp_Object, Lisp_Object *);
static int font_compare (const void *, const void *);
@@ -2565,7 +2565,6 @@
return val;
}
-static int num_fonts;
static void
font_clear_cache (FRAME_PTR f, Lisp_Object cache, struct font_driver *driver)
@@ -2598,7 +2597,6 @@
{
eassert (font && driver == font->driver);
driver->close (f, font);
- num_fonts--;
}
}
if (driver->free_entity)
@@ -2856,7 +2854,6 @@
return Qnil;
ASET (entity, FONT_OBJLIST_INDEX,
Fcons (font_object, AREF (entity, FONT_OBJLIST_INDEX)));
- num_fonts++;
font = XFONT_OBJECT (font_object);
min_width = (font->min_width ? font->min_width
@@ -2901,7 +2898,6 @@
eassert (FRAME_X_DISPLAY_INFO (f)->n_fonts);
FRAME_X_DISPLAY_INFO (f)->n_fonts--;
#endif
- num_fonts--;
}
@@ -3578,7 +3574,7 @@
Lisp_Object it;
int i;
- /* Set boolean values to Qt or Qnil */
+ /* Set boolean values to Qt or Qnil. */
for (i = 0; boolean_properties[i] != NULL; ++i)
for (it = alist; ! NILP (it); it = XCDR (it))
{
@@ -3757,7 +3753,7 @@
#endif
-/* Lisp API */
+/* Lisp API. */
DEFUN ("fontp", Ffontp, Sfontp, 1, 2, 0,
doc: /* Return t if OBJECT is a font-spec, font-entity, or font-object.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111600: * font.c (num_fonts): Remove the leftover from old,
Dmitry Antipov <=