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

[YAMAMOTO Mitsuharu]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     YAMAMOTO Mitsuharu <mituharu>   07/10/05 08:15:25

Index: macterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/macterm.c,v
retrieving revision 1.214.2.8
retrieving revision 1.214.2.9
diff -u -b -r1.214.2.8 -r1.214.2.9
--- macterm.c   27 Aug 2007 08:33:37 -0000      1.214.2.8
+++ macterm.c   5 Oct 2007 08:15:24 -0000       1.214.2.9
@@ -2275,6 +2275,9 @@
 
   for (i = 0; i < h; i++)
     bits[i] = ~bits[i];
+
+  BLOCK_INPUT;
+
   provider = CGDataProviderCreateWithData (NULL, bits,
                                           sizeof (unsigned short) * h, NULL);
   if (provider)
@@ -2284,6 +2287,8 @@
                                             provider, NULL, 0);
       CGDataProviderRelease (provider);
     }
+
+  UNBLOCK_INPUT;
 }
 
 static void
@@ -2294,7 +2299,11 @@
     return;
 
   if (fringe_bmp[which])
+    {
+      BLOCK_INPUT;
     CGImageRelease (fringe_bmp[which]);
+      UNBLOCK_INPUT;
+    }
   fringe_bmp[which] = 0;
 }
 #endif
@@ -8143,7 +8152,7 @@
 
       font_id = atsu_find_font_from_family_name (family);
       if (font_id == kATSUInvalidFontID)
-       return;
+       return NULL;
       size_fixed = Long2Fix (size);
       bold_p = (fontface & bold) != 0;
       italic_p = (fontface & italic) != 0;