[Emacs-diffs] Changes to emacs/src/xfont.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/07/10 01:26:00

Index: xfont.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfont.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- xfont.c     9 Jul 2008 07:38:55 -0000       1.17
+++ xfont.c     10 Jul 2008 01:25:59 -0000      1.18
@@ -509,7 +509,10 @@
      font.  */
   registry = AREF (entity, FONT_REGISTRY_INDEX);
   if (font_registry_charsets (registry, &encoding, &repertory) < 0)
+    {
+      font_add_log ("  x:unknown registry", registry, Qnil);
     return Qnil;
+    }
 
   if (XINT (AREF (entity, FONT_SIZE_INDEX)) != 0)
     pixel_size = XINT (AREF (entity, FONT_SIZE_INDEX));
@@ -522,7 +525,10 @@
     }
   len = font_unparse_xlfd (entity, pixel_size, name, 256);
   if (len <= 0)
+    {
+      font_add_log ("  x:unparse failed", entity, Qnil);
     return Qnil;
+    }
 
   BLOCK_INPUT;
   x_catch_errors (display);
@@ -562,7 +568,10 @@
   UNBLOCK_INPUT;
 
   if (! xfont)
+    {
+      font_add_log ("  x:open failed", build_string (name), Qnil);
     return Qnil;
+    }
 
   font_object = font_make_object (VECSIZE (struct xfont_info),
                                  entity, pixel_size);