# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1115332986 0
# Node ID ea21bf283231179df4121ef6a6df2ae452742d3c
# Parent  d79218691a51dfddb7b94023ba62379258a03795
(line-move-1): Fix 2005-04-26 change.  Must still use
vertical-motion when selective-display is active.

diff -r d79218691a51 -r ea21bf283231 lisp/simple.el
--- a/lisp/simple.el	Thu May 05 22:42:38 2005 +0000
+++ b/lisp/simple.el	Thu May 05 22:43:06 2005 +0000
@@ -3416,13 +3416,14 @@
 		;; Now move a line.
 		(end-of-line)
 		;; If there's no invisibility here, move over the newline.
-		(if (not (line-move-invisible-p (point)))
+		(if (and (not (integerp selective-display))
+			 (not (line-move-invisible-p (point))))
 		    ;; We avoid vertical-motion when possible
 		    ;; because that has to fontify.
 		    (if (eobp)
-		       (if (not noerror)
-			   (signal 'end-of-buffer nil)
-			 (setq done t))
+			(if (not noerror)
+			    (signal 'end-of-buffer nil)
+			  (setq done t))
 		      (forward-line 1))
 		  ;; Otherwise move a more sophisticated way.
 		  ;; (What's the logic behind this code?)
@@ -3432,11 +3433,13 @@
 			 (setq done t))))
 		(unless done
 		  (setq arg (1- arg))))
-	      ;; The logic of this is the same as the loop above, 
+	      ;; The logic of this is the same as the loop above,
 	      ;; it just goes in the other direction.
 	      (while (and (< arg 0) (not done))
 		(beginning-of-line)
-		(if (or (bobp) (not (line-move-invisible-p (1- (point)))))
+		(if (or (bobp)
+			(and (not (integerp selective-display))
+			     (not (line-move-invisible-p (1- (point))))))
 		    (if (bobp)
 			(if (not noerror)
 			    (signal 'beginning-of-buffer nil)