mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-11 05:51:21 -08:00
Code Issues Projects Releases Wiki Activity

[USE_MAC_TSM] (mac_handle_text_input_event):

Browse source 
Check if FACE_FROM_ID returns NULL.
This commit is contained in:
YAMAMOTO Mitsuharu 2008-07-11 08:53:44 +00:00
parent cd97583068
commit 2d64e9bbb9
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/ChangeLog
View file

@ -1,3 +1,22 @@
2008-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* Makefile.in (frame.o, keyboard.o, xdisp.o, xfaces.o):
Depend on macgui.h.
* macfns.c (Fx_server_version): Don't use gestaltSystemVersionMajor,
gestaltSystemVersionMinor, or gestaltSystemVersionBugFix.
* macterm.c (keycode_to_xkeysym_table): Add entries for f17, f18,
and f19.
[MAC_OSX] (fn_keycode_to_keycode_table): Likewise.
* macterm.h (gestaltSystemVersionMajor, gestaltSystemVersionMinor)
(gestaltSystemVersionBugFix) [MAC_OS_X_VERSION_MAX_ALLOWED < 1040]:
Remove enumerators.
* mactoolbox.c [USE_MAC_TSM] (mac_handle_text_input_event):
Check if FACE_FROM_ID returns NULL.
2008-07-07 Chong Yidong <cyd@stupidchicken.com>
* image.c (png_load): Use correct bit-depth for setting background

7
src/mactoolbox.c
View file

@ -575,7 +575,7 @@ mac_handle_text_input_event (next_handler, event, data)
int hpos, vpos, x, y;
struct glyph_row *row;
struct glyph *glyph;
XFontStruct *font;
struct face *face;
f = mac_focus_frame (&one_mac_display_info);
w = XWINDOW (f->selected_window);
@ -600,9 +600,10 @@ mac_handle_text_input_event (next_handler, event, data)
+ row->visible_height
+ f->top_pos + FRAME_OUTER_TO_INNER_DIFF_Y (f));
font = FACE_FROM_ID (f, glyph->face_id)->font;
if (font)
face = FACE_FROM_ID (f, glyph->face_id);
if (face && face->font)
{
XFontStruct *font = face->font;
Fixed point_size = Long2Fix (font->mac_fontsize);
short height = row->visible_height;
short ascent = row->ascent;