From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 14 Jul 2009 14:22:44 +0000 (+0000)
Subject: * simple.el (line-move): Call line-move-1 if lines are truncated.
X-Git-Tag: emacs-23.1~83
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=857449ed2062dc16b92e5c98e7a316bfde85148e;p=emacs.git

* simple.el (line-move): Call line-move-1 if lines are truncated.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb4c8d32529..2e4ccda9011 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-14  Chong Yidong  <cyd@stupidchicken.com>
+
+	* simple.el (line-move): Call line-move-1 if lines are truncated.
+
 2009-07-14  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/edebug.el (edebug-setup-hook, edebug-all-forms)
diff --git a/lisp/simple.el b/lisp/simple.el
index 44d3ae5040d..569709771bb 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4048,7 +4048,12 @@ into account variable-width characters and line continuation."
 	       (not executing-kbd-macro)
 	       (line-move-partial arg noerror to-end))
     (set-window-vscroll nil 0 t)
-    (if line-move-visual
+    (if (and line-move-visual
+	     ;; Currently, line-move-visual does not work well with
+	     ;; truncation/hscrolling.  This is a stop-gap measure for
+	     ;; Emacs 23.1.
+	     (null truncate-lines)
+	     (null (truncated-partial-width-window-p)))
 	(line-move-visual arg noerror)
       (line-move-1 arg noerror to-end))))