1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 08:11:05 -08:00

(remember_mouse_glyph): Simplify last change.

This commit is contained in:
Kim F. Storm 2006-10-23 11:49:48 +00:00
parent fa695dab5e
commit 88efeba65e

View file

@ -2081,7 +2081,7 @@ remember_mouse_glyph (f, gx, gy, rect)
int gx, gy;
NativeRectangle *rect;
{
Lisp_Object window = Qnil;
Lisp_Object window;
struct window *w;
struct glyph_row *r, *gr, *end_row;
enum window_part part;
@ -2091,10 +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. */
if (f->glyphs_initialized_p)
window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0);
if (NILP (window))
if (!f->glyphs_initialized_p
|| (window = window_from_coordinates (f, gx, gy, &part, &x, &y, 0),
NILP (window)))
{
width = FRAME_SMALLEST_CHAR_WIDTH (f);
height = FRAME_SMALLEST_FONT_HEIGHT (f);