Fix pos-visible-in-window-p under bidi redisplay.

 src/xdisp.c (move_it_in_display_line_to): Record the best matching
 position for TO_CHARPOS while scanning the line, and restore it on
 exit if none of the characters scanned was an exact match.  Fixes
 vertical-motion and pos-visible-in-window-p under bidi redisplay
 when exact match is impossible due to invisible text, and the
 lines are truncated.

diff --cc src/ChangeLog
index 9b66b8f34ff56570af8c1b85cc4fc6bf68799d4e,dd5a1fba871d27cbf1d94e6bf15a8cc44ba4dc9e..ad207884753600a840adadedfe17439d83a6cd61
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,10 +1,16 @@@
 -      vertical-motion and pos-visible-in-window-p when exact match is
 -      impossible due to invisible text, and the lines are truncated.
+ 2011-07-23  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * xdisp.c (move_it_in_display_line_to): Record the best matching
+       position for TO_CHARPOS while scanning the line, and restore it on
+       exit if none of the characters scanned was an exact match.  Fixes
++      vertical-motion and pos-visible-in-window-p under bidi redisplay
++      when exact match is impossible due to invisible text, and the
++      lines are truncated.
++
 +2011-07-23  Jan Djärv  <jan.h.d@swipnet.se>
 +
 +      * nsterm.m (initFrameFromEmacs): Set NSTitledWindowMask in styleMask
 +      for OSX >= 10.7.
  
  2011-07-22  Eli Zaretskii  <eliz@gnu.org>
  

diff --cc src/xdisp.c
Simple merge