diff options
| author | Kim F. Storm <storm@cua.dk> | 2006-10-23 11:49:48 +0000 |
|---|---|---|
| committer | Kim F. Storm <storm@cua.dk> | 2006-10-23 11:49:48 +0000 |
| commit | 88efeba65ea05ecf778a56758138484ccdfd5103 (patch) | |
| tree | e8e5134811d8d744377ec81e1b2d306a89503468 | |
| parent | fa695dab5e367801799a188f10d49f2caa1a095b (diff) | |
| download | emacs-88efeba65ea05ecf778a56758138484ccdfd5103.tar.gz | |
(remember_mouse_glyph): Simplify last change.
| -rw-r--r-- | src/xdisp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index cf508288616..b85fdb4d71e 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 = 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); |