[Emacs-diffs] emacs/lisp ChangeLog simple.el [EMACS_23_1_RC]

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Chong Yidong <cyd>      09/07/14 14:22:51

Modified files:
        lisp           : ChangeLog simple.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.15702.2.28&r2=1.15702.2.29
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/simple.el?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.988&r2=1.988.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15702.2.28
retrieving revision 1.15702.2.29
diff -u -b -r1.15702.2.28 -r1.15702.2.29
--- ChangeLog   14 Jul 2009 08:00:29 -0000      1.15702.2.28
+++ ChangeLog   14 Jul 2009 14:22:44 -0000      1.15702.2.29
@@ -1,3 +1,7 @@
+2009-07-14  Chong Yidong  <address@hidden>
+
+       * simple.el (line-move): Call line-move-1 if lines are truncated.
+
 2009-07-14  Glenn Morris  <address@hidden>
 
        * emacs-lisp/edebug.el (edebug-setup-hook, edebug-all-forms)

Index: simple.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/simple.el,v
retrieving revision 1.988
retrieving revision 1.988.2.1
diff -u -b -r1.988 -r1.988.2.1
--- simple.el   13 Jun 2009 18:56:11 -0000      1.988
+++ simple.el   14 Jul 2009 14:22:51 -0000      1.988.2.1
@@ -4048,7 +4048,12 @@
               (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))))