[Emacs-diffs] /srv/bzr/emacs/trunk r99281: * xdisp.c (pos_visible_p): Check for invisible text at the correct pos (Bug#4040).

[Chong Yidong]

------------------------------------------------------------
revno: 99281
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-09 14:48:16 -0500
message:
  * xdisp.c (pos_visible_p): Check for invisible text at the correct pos 
(Bug#4040).
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-01-09 14:16:10 +0000
+++ b/src/ChangeLog     2010-01-09 19:48:16 +0000
@@ -1,3 +1,8 @@
+2010-01-09  Chong Yidong  <address@hidden>
+
+       * xdisp.c (pos_visible_p): Check for invisible text at the correct
+       position (Bug#4040).
+
 2010-01-09  Eli Zaretskii  <address@hidden>
 
        * editfns.c (Ffloat_time): Doc fix.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2010-01-09 04:16:32 +0000
+++ b/src/xdisp.c       2010-01-09 19:48:16 +0000
@@ -1363,7 +1363,7 @@
       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 @@
              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