(line-move): If we can't move enough lines, go to beginning or end of line.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83ef065922a1dc4a72446a9c9b8953e67c25c71f..d66d18087323785c8ec82d31b7ea203c621e6aac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,9 @@
 
 2002-01-12  Richard M. Stallman  <rms@gnu.org>
 
+       * simple.el (line-move): If we can't move enough lines,
+       go to beginning or end of line.
+
        * help-mode.el (help-xref-go-back): Restore POSITION in proper buffer
        and proper window.
 

diff --git a/lisp/simple.el b/lisp/simple.el
index 6cfc1b306af317e2471445e956e4efe8c508f9f6..56b45e0383605f5df81fb3d29f4716cfb087aaf9 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2562,18 +2562,21 @@ Outline mode sets this."
          (if (and (not (integerp selective-display))
                   (not line-move-ignore-invisible))
              ;; Use just newline characters.
+             ;; Set ARG to 0 if we move as many lines as requested.
              (or (if (> arg 0)
                      (progn (if (> arg 1) (forward-line (1- arg)))
                             ;; This way of moving forward ARG lines
                             ;; verifies that we have a newline after the last one.
                             ;; It doesn't get confused by intangible text.
                             (end-of-line)
-                            (zerop (forward-line 1)))
+                            (if (zerop (forward-line 1))
+                                (setq arg 0)))
                    (and (zerop (forward-line arg))
-                        (bolp)))
+                        (bolp)
+                        (setq arg 0)))
                  (signal (if (< arg 0)
                              'beginning-of-buffer
-a                          'end-of-buffer)
+                           'end-of-buffer)
                          nil))
            ;; Move by arg lines, but ignore invisible ones.
            (while (> arg 0)
@@ -2594,7 +2597,16 @@ a                            'end-of-buffer)
              (while (and (not (bobp)) (line-move-invisible (1- (point))))
                (goto-char (previous-char-property-change (point)))))))
 
-      (line-move-finish (or goal-column temporary-goal-column) opoint)))
+      (cond ((> arg 0)
+            ;; If we did not move down as far as desired,
+            ;; at least go to end of line.
+            (end-of-line))
+           ((< arg 0)
+            ;; If we did not move down as far as desired,
+            ;; at least go to end of line.
+            (beginning-of-line))
+           (t
+            (line-move-finish (or goal-column temporary-goal-column) opoint)))))
   nil)
 
 (defun line-move-finish (column opoint)