summaryrefslogtreecommitdiff
path: root/lisp/compare-w.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1993-11-14 02:56:24 +0000
committerRichard M. Stallman <rms@gnu.org>1993-11-14 02:56:24 +0000
commit5c568c36da731ab3191c5124a63200a59e4f13ce (patch)
tree5845c1b3ccb7a2550907babe8ff7fc94752d679e /lisp/compare-w.el
parent1a5435f16b02c1aaa958b33e3e711dc10307cbfc (diff)
downloademacs-5c568c36da731ab3191c5124a63200a59e4f13ce.tar.gz
(compare-windows-skip-whitespace): Swap the two
and's within the or.
Diffstat (limited to 'lisp/compare-w.el')
-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."
(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))