# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1010894471 0
# Node ID b9928a414b1924b34d5f960e297df012b56f2ad9
# Parent  41928c5aed9cfa3f57161af15991f6f1399a6e10
(line-move): If we can't move enough lines, go to beginning or end of line.

diff -r 41928c5aed9c -r b9928a414b19 lisp/simple.el
--- a/lisp/simple.el	Sun Jan 13 02:39:08 2002 +0000
+++ b/lisp/simple.el	Sun Jan 13 04:01:11 2002 +0000
@@ -2562,18 +2562,21 @@
 	  (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 @@
 	      (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)