From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 14 Nov 1993 02:56:24 +0000 (+0000)
Subject: (compare-windows-skip-whitespace): Swap the two
X-Git-Tag: emacs-19.34~10846
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5dd1ad8ed5c0209da4d1d3ac07b798f3ff34c27d;p=emacs.git

(compare-windows-skip-whitespace): Swap the two
and's within the or.
---

diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index a6bd00e1a07..717974b364b 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -141,15 +141,15 @@ If `compare-ignore-case' is non-nil, changes in case are also ignored."
   (let ((end (point))
 	(beg (point))
 	(opoint (point)))
-    (while (or (and (/= (point) start)
-		    ;; Consider at least the char before point,
-		    ;; unless it is also before START.
-		    (= (point) opoint))
-	       (and (looking-at compare-windows-whitespace)
+    (while (or (and (looking-at compare-windows-whitespace)
 		    (<= end (match-end 0))
 		    ;; This match goes past END, so advance END.
 		    (progn (setq end (match-end 0))
-			   (> (point) start))))
+			   (> (point) start)))
+	       (and (/= (point) start)
+		    ;; Consider at least the char before point,
+		    ;; unless it is also before START.
+		    (= (point) opoint)))
       ;; keep going back until whitespace
       ;; doesn't extend to or past end
       (forward-char -1))