From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Fri, 5 Oct 2007 08:15:48 +0000 (+0000)
Subject: (mac_load_query_font): Fix missing return value.
X-Git-Tag: emacs-pretest-22.1.90~680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb91e86ae525691cae9417e38b15d0f80be4ac91;p=emacs.git

(mac_load_query_font): Fix missing return value.
[USE_CG_DRAWING] (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap):
Add BLOCK_INPUT.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4ab53305baf..eb45d47a8f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macterm.c (mac_load_query_font): Fix missing return value.
+	[USE_CG_DRAWING] (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap):
+	Add BLOCK_INPUT.
+
 2007-10-02  Richard Stallman  <rms@gnu.org>
 
 	* xdisp.c (get_window_cursor_type): Implement documented behavior
diff --git a/src/macterm.c b/src/macterm.c
index 01ac7328d6f..f101899ddf9 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -2275,6 +2275,9 @@ mac_define_fringe_bitmap (which, bits, h, wd)
 
   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 @@ mac_define_fringe_bitmap (which, bits, h, wd)
 					     provider, NULL, 0);
       CGDataProviderRelease (provider);
     }
+
+  UNBLOCK_INPUT;
 }
 
 static void
@@ -2294,7 +2299,11 @@ mac_destroy_fringe_bitmap (which)
     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 @@ mac_load_query_font (f, fontname)
 
       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;