[Emacs-diffs] Changes to emacs/src/nsfont.m,v

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Adrian Robert <arobert> 08/09/30 01:03:04

Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- nsfont.m    27 Sep 2008 19:07:16 -0000      1.13
+++ nsfont.m    30 Sep 2008 01:03:03 -0000      1.14
@@ -190,12 +190,12 @@
 static int
 nsfont_trait_distance (unsigned int traits1, unsigned int traits2)
 {
-  int i, d =0;
-  for (i =0; i<sizeof (unsigned int)*8; i++)
+  int i, d = 0;
+  for (i = 0; i < sizeof (unsigned int) * 8; i++)
     {
       d += (traits1 & 0x1) ^ (traits2 & 0x1);
-      traits1 >> 1;
-      traits2 >> 1;
+      traits1 >>= 1;
+      traits2 >>= 1;
     }
   return d;
 }
@@ -267,7 +267,7 @@
 
 
 /* List fonts exactly matching with FONT_SPEC on FRAME.  The value
-   is a vector of font-entities.  This is the sole API that
+   is a **list** of font-entities.  This is the sole API that
    allocates font-entities.  */
 static Lisp_Object
 nsfont_list (Lisp_Object frame, Lisp_Object font_spec)
@@ -349,7 +349,7 @@
   if (NSFONT_TRACE)
       fprintf (stderr, "    Returning %d entities.\n", XINT (Flength (list)));
 
-  return (NILP (list) ? Qnil : Fvconcat (1, &list));/* Qnil was null_vector */
+  return list;
 }
 
 
@@ -540,8 +540,9 @@
   family = nsfont_get_family (font_entity);
   if (NSFONT_TRACE)
     {
-      fprintf (stderr, "family: '%s'\ttraits = %ld\tbold = %d\n",
-               [family UTF8String], traits, traits & NSBoldFontMask);
+      fprintf (stderr, "family: '%s'\ttraits = %ld\tbold = %d\titalic = %d\n",
+               [family UTF8String], traits, traits & NSBoldFontMask,
+               traits & NSItalicFontMask);
     }
 
   /* see http://cocoadev.com/forums/comments.php?DiscussionID =74 */
@@ -576,6 +577,8 @@
         }
     }
 
+//NSLog(@"address@hidden",nsfont);
+
 #if 0
   {
     NSNumber *cached = [fontCache objectForKey: nsfont];