diff options
author | Kim F. Storm <storm@cua.dk> | 2006-10-23 09:58:49 +0000 |
---|---|---|
committer | Kim F. Storm <storm@cua.dk> | 2006-10-23 09:58:49 +0000 |
commit | 4fa93fa8596baeb9d9f42942417bc99fd602b88b (patch) | |
tree | 8f58377bac39b291c5cf20b074273a462f585789 | |
parent | a4614668b42cdf5b707df387f7b6011a5554273e (diff) | |
download | emacs-4fa93fa8596baeb9d9f42942417bc99fd602b88b.tar.gz |
(remember_mouse_glyph): Don't crash if glyphs are not initialized.
-rw-r--r-- | src/xdisp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 875d12a4816..cf508288616 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -2081,7 +2081,7 @@ remember_mouse_glyph (f, gx, gy, rect) int gx, gy; NativeRectangle *rect; { - Lisp_Object window; + Lisp_Object window = Qnil; struct window *w; struct glyph_row *r, *gr, *end_row; enum window_part part; @@ -2091,7 +2091,9 @@ remember_mouse_glyph (f, gx, gy, rect) /* Try to determine frame pixel position and size of the glyph under frame pixel coordinates X/Y on frame F. */ - window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0); + if (f->glyphs_initialized_p) + window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0); + if (NILP (window)) { width = FRAME_SMALLEST_CHAR_WIDTH (f); |