From: Kim F. Storm <storm@cua.dk>
Date: Thu, 5 May 2005 22:43:06 +0000 (+0000)
Subject: (line-move-1): Fix 2005-04-26 change.  Must still use
X-Git-Tag: ttn-vms-21-2-B4~516
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=22c8bff16ac71a128e8a23124f0299caa3094f05;p=emacs.git

(line-move-1): Fix 2005-04-26 change.  Must still use
vertical-motion when selective-display is active.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 43a5708d6c3..204b2fb21bb 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3416,13 +3416,14 @@ Outline mode sets this."
 		;; 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 @@ Outline mode sets this."
 			 (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)