diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2007-10-05 08:15:48 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2007-10-05 08:15:48 +0000 |
| commit | cb91e86ae525691cae9417e38b15d0f80be4ac91 (patch) | |
| tree | 9e2363693abc978c6a27ba5f7736281baf6832de /src/macterm.c | |
| parent | dde2f1a05fbebc386748f3105258d4820332cb39 (diff) | |
| download | emacs-cb91e86ae525691cae9417e38b15d0f80be4ac91.tar.gz emacs-cb91e86ae525691cae9417e38b15d0f80be4ac91.tar.bz2 emacs-cb91e86ae525691cae9417e38b15d0f80be4ac91.zip | |
(mac_load_query_font): Fix missing return value.
[USE_CG_DRAWING] (mac_define_fringe_bitmap, mac_destroy_fringe_bitmap):
Add BLOCK_INPUT.
Diffstat (limited to 'src/macterm.c')
| -rw-r--r-- | src/macterm.c | 13 |
1 files changed, 11 insertions, 2 deletions
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; |