aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1993-11-14 02:56:24 +0000
committerRichard M. Stallman1993-11-14 02:56:24 +0000
commit5dd1ad8ed5c0209da4d1d3ac07b798f3ff34c27d (patch)
treed3c1464ccc3905110217d4ce0af8d43416ca7c08
parentf48872fc37fcd26354e40487ba5a6927839b8928 (diff)
downloademacs-5dd1ad8ed5c0209da4d1d3ac07b798f3ff34c27d.tar.gz
emacs-5dd1ad8ed5c0209da4d1d3ac07b798f3ff34c27d.zip
(compare-windows-skip-whitespace): Swap the two
and's within the or.
-rw-r--r--lisp/compare-w.el12
1 files changed, 6 insertions, 6 deletions
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."
141 (let ((end (point)) 141 (let ((end (point))
142 (beg (point)) 142 (beg (point))
143 (opoint (point))) 143 (opoint (point)))
144 (while (or (and (/= (point) start) 144 (while (or (and (looking-at compare-windows-whitespace)
145 ;; Consider at least the char before point,
146 ;; unless it is also before START.
147 (= (point) opoint))
148 (and (looking-at compare-windows-whitespace)
149 (<= end (match-end 0)) 145 (<= end (match-end 0))
150 ;; This match goes past END, so advance END. 146 ;; This match goes past END, so advance END.
151 (progn (setq end (match-end 0)) 147 (progn (setq end (match-end 0))
152 (> (point) start)))) 148 (> (point) start)))
149 (and (/= (point) start)
150 ;; Consider at least the char before point,
151 ;; unless it is also before START.
152 (= (point) opoint)))
153 ;; keep going back until whitespace 153 ;; keep going back until whitespace
154 ;; doesn't extend to or past end 154 ;; doesn't extend to or past end
155 (forward-char -1)) 155 (forward-char -1))