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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb4c8d325298cad9a2eaf2ef6d414beacb663517..2e4ccda90112c8c48c8932e623ae4614bb33048f 100644 (file)
--- 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 44d3ae5040db1bd6b23309d901cd6e56b341a298..569709771bbf9dccdf78a771ea1be99446ad2032 100644 (file)
--- 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))))