[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src font.c
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] emacs/src font.c |
Date: |
Tue, 23 Jun 2009 05:52:59 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 09/06/23 05:52:59
Modified files:
src : font.c
Log message:
(font_sort_entities, font_list_entities)
(font_matching_entity, font_open_entity)
(font_close_object): Change font_add_log to FONT_ADD_LOG.
(Vfont_log): Delete static.
(font_log_env_checked): Delete this variable.
(font_add_log): Don't check font_log_env_checked.
(font_deferred_log): Check Vfont_log.
(init_font): New function.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/font.c?cvsroot=emacs&r1=1.133&r2=1.134
Patches:
Index: font.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/font.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -b -r1.133 -r1.134
--- font.c 10 Jun 2009 01:26:15 -0000 1.133
+++ font.c 23 Jun 2009 05:52:59 -0000 1.134
@@ -2372,7 +2372,7 @@
vec = best_entity;
SAFE_FREE ();
- font_add_log ("sort-by", prefer, vec);
+ FONT_ADD_LOG ("sort-by", prefer, vec);
return vec;
}
@@ -2832,7 +2832,7 @@
}
val = (i > 0 ? Fvconcat (i, vec) : null_vector);
- font_add_log ("list", spec, val);
+ FONT_ADD_LOG ("list", spec, val);
return (val);
}
@@ -2883,7 +2883,7 @@
if (! NILP (entity))
break;
}
- font_add_log ("match", work, entity);
+ FONT_ADD_LOG ("match", work, entity);
return entity;
}
@@ -2925,7 +2925,7 @@
font_object = driver_list->driver->open (f, entity, scaled_pixel_size);
ASET (font_object, FONT_SIZE_INDEX, make_number (pixel_size));
- font_add_log ("open", entity, font_object);
+ FONT_ADD_LOG ("open", entity, font_object);
if (NILP (font_object))
return Qnil;
ASET (entity, FONT_OBJLIST_INDEX,
@@ -2972,7 +2972,7 @@
if (NILP (AREF (font_object, FONT_TYPE_INDEX)))
/* Already closed. */
return;
- font_add_log ("close", font_object, Qnil);
+ FONT_ADD_LOG ("close", font_object, Qnil);
font->driver->close (f, font);
#ifdef HAVE_WINDOW_SYSTEM
font_assert (FRAME_X_DISPLAY_INFO (f)->n_fonts);
@@ -5003,8 +5003,7 @@
return table;
}
-static Lisp_Object Vfont_log;
-static int font_log_env_checked;
+Lisp_Object Vfont_log;
/* The deferred font-log data of the form [ACTION ARG RESULT].
If ACTION is not nil, that is added to the log when font_add_log is
@@ -5023,11 +5022,6 @@
Lisp_Object tail, val;
int i;
- if (! font_log_env_checked)
- {
- Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt;
- font_log_env_checked = 1;
- }
if (EQ (Vfont_log, Qt))
return;
if (STRINGP (AREF (Vfont_log_deferred, 0)))
@@ -5107,6 +5101,8 @@
char *action;
Lisp_Object arg, result;
{
+ if (EQ (Vfont_log, Qt))
+ return;
ASET (Vfont_log_deferred, 0, build_string (action));
ASET (Vfont_log_deferred, 1, arg);
ASET (Vfont_log_deferred, 2, result);
@@ -5298,5 +5294,11 @@
#endif /* HAVE_WINDOW_SYSTEM */
}
+void
+init_font ()
+{
+ Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt;
+}
+
/* arch-tag: 74c9475d-5976-4c93-a327-942ae3072846
(do not change this comment) */