Add font logging to list and match functions.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e002b65d73be2593966a088d920694ae1288008..7b14e5eeffa10c59f6ae91654f6a24dedccfd973 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-18  Jason Rumney  <jasonr@gnu.org>
+
+        * w32font.c (w32font_list, w32font_match): Add logging.
+
+        * w32uniscribe (uniscribe_list, uniscribe_match): Add logging.
+
 2008-06-17  Chong Yidong  <cyd@stupidchicken.com>
 
        * font.c (font_parse_fcname): Store divider characters for

diff --git a/src/w32font.c b/src/w32font.c
index 9e4bb494e70e66ceea53e2eff72f9596ef49fad6..0dc18674aa0b0979c874eb5719397803afa6fb08 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -162,7 +162,9 @@ static Lisp_Object
 w32font_list (frame, font_spec)
      Lisp_Object frame, font_spec;
 {
-  return w32font_list_internal (frame, font_spec, 0);
+  Lisp_Object fonts = w32font_list_internal (frame, font_spec, 0);
+  font_add_log ("w32font-list", font_spec, fonts);
+  return fonts;
 }
 
 /* w32 implementation of match for font backend.
@@ -173,7 +175,9 @@ static Lisp_Object
 w32font_match (frame, font_spec)
      Lisp_Object frame, font_spec;
 {
-  return w32font_match_internal (frame, font_spec, 0);
+  Lisp_Object entity = w32font_match_internal (frame, font_spec, 0);
+  font_add_log ("w32font-match", font_spec, entity);
+  return entity;
 }
 
 /* w32 implementation of list_family for font backend.

diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index 2abd742e8d5812b40ae395b5630cacb953828201..bd201739f51f4758376dabde009a06c7f6496227 100644 (file)
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -76,14 +76,18 @@ static Lisp_Object
 uniscribe_list (frame, font_spec)
      Lisp_Object frame, font_spec;
 {
-  return w32font_list_internal (frame, font_spec, 1);
+  Lisp_Object fonts = w32font_list_internal (frame, font_spec, 1);
+  font_add_log ("uniscribe-list", font_spec, fonts);
+  return fonts;
 }
 
 static Lisp_Object
 uniscribe_match (frame, font_spec)
      Lisp_Object frame, font_spec;
 {
-  return w32font_match_internal (frame, font_spec, 1);
+  Lisp_Object entity = w32font_match_internal (frame, font_spec, 1);
+  font_add_log ("uniscribe-match", font_spec, entity);
+  return entity;
 }
 
 static Lisp_Object