* xdisp.c (pos_visible_p): Check for invisible text at the correct pos (Bug#4040).

diff --git a/src/ChangeLog b/src/ChangeLog
index bd9c6cfbfdf2e13bb6b82fe25a1423e4cdedb284..e0faafaf2ca2bd2d832495f75deee3c8821c6bf4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xdisp.c (pos_visible_p): Check for invisible text at the correct
+       position (Bug#4040).
+
 2010-01-09  Eli Zaretskii  <eliz@gnu.org>
 
        * editfns.c (Ffloat_time): Doc fix.

diff --git a/src/xdisp.c b/src/xdisp.c
index 8d023fc5ae3387dcf892b800a09a36b1cf1ad1c4..fd0f6e516958b72005dcc41a272dcca708793b03 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1363,7 +1363,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, rowh, vpos)
       int top_x = it.current_x;
       int top_y = it.current_y;
       enum it_method it_method = it.method;
-      /* Calling line_bottom_y may change it.method.  */
+      /* Calling line_bottom_y may change it.method, it.position, etc.  */
       int bottom_y = (last_height = 0, line_bottom_y (&it));
       int window_top_y = WINDOW_HEADER_LINE_HEIGHT (w);
 
@@ -1378,7 +1378,7 @@ pos_visible_p (w, charpos, x, y, rtop, rbot, rowh, vpos)
              Lisp_Object window, prop;
 
              XSETWINDOW (window, w);
-             prop = Fget_char_property (make_number (it.position.charpos),
+             prop = Fget_char_property (make_number (charpos),
                                         Qinvisible, window);
 
              /* If charpos coincides with invisible text covered with an