(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 a6bd00e1a07d0bef44151273fd3bcc59cef08905..717974b364bb6f8a39ac66a2e255677b07349e59 100644 (file)
--- 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))