From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 15 Jul 2011 10:50:03 +0000 (+0300)
Subject: Fix vertical cursor motion in Speedbar frames under bidi display.
X-Git-Tag: emacs-pretest-24.0.90~104^2~258
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aa4b6df6901fc736db6165f379857f448abbe711;p=emacs.git

Fix vertical cursor motion in Speedbar frames under bidi display.

 src/xdisp.c (move_it_in_display_line_to): Fix vertical motion with
 bidi redisplay when a line includes both an image and is
 truncated.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 21563806ece..3bb02a71865 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-15  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (move_it_in_display_line_to): Fix vertical motion with
+	bidi redisplay when a line includes both an image and is
+	truncated.
+
 2011-07-14  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Fix minor problems found by static checking.
diff --git a/src/xdisp.c b/src/xdisp.c
index 69a66a4db64..50da62ca0ab 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7928,7 +7928,14 @@ move_it_in_display_line_to (struct it *it,
 	      || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it))
 	    {
 	      if (!get_next_display_element (it)
-		  || BUFFER_POS_REACHED_P ())
+		  || BUFFER_POS_REACHED_P ()
+		  /* If we are past TO_CHARPOS, but never saw any
+		     character positions smaller than TO_CHARPOS,
+		     return MOVE_POS_MATCH_OR_ZV, like the
+		     unidirectional display did.  */
+		  || ((op & MOVE_TO_POS) != 0
+		      && !saw_smaller_pos
+		      && IT_CHARPOS (*it) > to_charpos))
 		{
 		  result = MOVE_POS_MATCH_OR_ZV;
 		  break;
@@ -7939,6 +7946,13 @@ move_it_in_display_line_to (struct it *it,
 		  break;
 		}
 	    }
+	  else if ((op & MOVE_TO_POS) != 0
+		   && !saw_smaller_pos
+		   && IT_CHARPOS (*it) > to_charpos)
+	    {
+	      result = MOVE_POS_MATCH_OR_ZV;
+	      break;
+	    }
 	  result = MOVE_LINE_TRUNCATED;
 	  break;
 	}