Mercurial > emacs

changeset 78968:6d6dc60c958b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(mac_load_query_font): Fix missing return value. [USE_CG_DRAWING] (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap): Add BLOCK_INPUT.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Fri, 05 Oct 2007 08:15:24 +0000
parents ab500f45053d
children 32d9fbf909d4
files src/macterm.c
diffstat 1 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/macterm.c	Fri Oct 05 07:19:51 2007 +0000
+++ b/src/macterm.c	Fri Oct 05 08:15:24 2007 +0000
@@ -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])
-    CGImageRelease (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;