From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 15 Aug 2011 06:44:48 +0000 (+0300)
Subject: Another part of fixing bug #9296 with vertical cursor motion.
X-Git-Tag: emacs-pretest-24.0.90~104^2~124^2~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9fd8be0026fc24b1d291c5adb6cc179120b86627;p=emacs.git

Another part of fixing bug #9296 with vertical cursor motion.

 src/xdisp.c (move_it_in_display_line_to): Don't reset pixel
 coordinates of the iterator when restoring from ppos_it.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 40a0ed24e6a..628875f7ae6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-15  Eli Zaretskii  <eliz@gnu.org>
+
+	* xdisp.c (move_it_in_display_line_to): Don't reset pixel
+	coordinates of the iterator when restoring from ppos_it.
+	(Bug#9296)
+
 2011-08-14  Kenichi Handa  <handa@m17n.org>
 
 	* process.c (create_process): Call setup_process_coding_systems
diff --git a/src/xdisp.c b/src/xdisp.c
index ff3f55bef25..b83d4bac743 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -8093,7 +8093,8 @@ move_it_in_display_line_to (struct it *it,
 		{
 		  if (!at_eob_p && IT_CHARPOS (ppos_it) < ZV)
 		    RESTORE_IT (it, &ppos_it, ppos_data);
-		  goto buffer_pos_reached;
+		  result = MOVE_POS_MATCH_OR_ZV;
+		  break;
 		}
 	      if (ITERATOR_AT_END_OF_LINE_P (it))
 		{
@@ -8107,7 +8108,8 @@ move_it_in_display_line_to (struct it *it,
 	    {
 	      if (IT_CHARPOS (ppos_it) < ZV)
 		RESTORE_IT (it, &ppos_it, ppos_data);
-	      goto buffer_pos_reached;
+	      result = MOVE_POS_MATCH_OR_ZV;
+	      break;
 	    }
 	  result = MOVE_LINE_TRUNCATED;
 	  break;