From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 13 Aug 2017 14:49:07 +0000 (+0300)
Subject: Fix vertical cursor motion across too wide images
X-Git-Tag: emacs-26.0.90~471
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28a5b8adcc1cf5e70b06749c73645f4caa9d0b37;p=emacs.git

Fix vertical cursor motion across too wide images

* src/indent.c (Fvertical_motion): If lines are truncated and we
end up beyond the right margin of the window, don't assume we are
in the next screen line, unless VPOS actually says so.  (Bug#28071)
---

diff --git a/src/indent.c b/src/indent.c
index 4c6dacd2042..d76ac028d5b 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -2229,10 +2229,10 @@ whether or not it is currently displayed in some window.  */)
 		 screen lines we need to backtrack.  */
 	      it_overshoot_count = it.vpos;
 	    }
-	  /* We will overshoot if lines are truncated and point lies
+	  /* We might overshoot if lines are truncated and point lies
 	     beyond the right margin of the window.  */
 	  if (it.line_wrap == TRUNCATE && it.current_x >= it.last_visible_x
-	      && it_overshoot_count == 0)
+	      && it_overshoot_count == 0 && it.vpos > 0)
 	    it_overshoot_count = 1;
 	  if (it_overshoot_count > 0)
 	    move_it_by_lines (&it, -it_overshoot_count);