Mercurial > emacs
changeset 73479:0c7cbc22f015
(remember_mouse_glyph): Simplify last change.
| author | Kim F. Storm <storm@cua.dk> |
|---|---|
| date | Mon, 23 Oct 2006 11:49:48 +0000 |
| parents | b6c9688b6b62 |
| children | 93f756e426b8 |
| files | src/xdisp.c |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Mon Oct 23 10:02:31 2006 +0000 +++ b/src/xdisp.c Mon Oct 23 11:49:48 2006 +0000 @@ -2081,7 +2081,7 @@ 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 @@ /* 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);