From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 18 May 2017 19:54:35 +0000 (+0300)
Subject: Fix last change in line-move-finish
X-Git-Tag: emacs-26.0.90~521^2~372
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6816a659c61d26d2d3328f34e43280b4ae1cf09;p=emacs.git

Fix last change in line-move-finish

* lisp/simple.el (line-move-finish): Fix last change.  This corrects a
regression in C-n and C-p when lines are truncated, introduced by the
change in 2017-05-10.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index dfa30372dda..7f13df5006d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -6399,7 +6399,8 @@ If NOERROR, don't signal an error if we can't move that many lines."
 	       (point))))
 
 	;; Move to the desired column.
-        (if line-move-visual
+        (if (and line-move-visual
+                 (not (or truncate-lines truncate-partial-width-windows)))
             ;; Under line-move-visual, goal-column should be
             ;; interpreted in units of the frame's canonical character
             ;; width, which is exactly what vertical-motion does.