[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c,v |
Date: |
Mon, 23 Oct 2006 11:49:49 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 06/10/23 11:49:49
Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1127
retrieving revision 1.1128
diff -u -b -r1.1127 -r1.1128
--- xdisp.c 23 Oct 2006 09:58:49 -0000 1.1127
+++ xdisp.c 23 Oct 2006 11:49:48 -0000 1.1128
@@ -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);
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Stefan Monnier, 2006/10/01
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kim F. Storm, 2006/10/06
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Chong Yidong, 2006/10/13
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kim F. Storm, 2006/10/19
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v, Kim F. Storm, 2006/10/23
- [Emacs-diffs] Changes to emacs/src/xdisp.c,v,
Kim F. Storm <=