aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-05-27 07:10:56 +0000
committerRichard M. Stallman1994-05-27 07:10:56 +0000
commit5a534851893ffbd264a8dd2622169daee6a78f25 (patch)
tree97969b9c8c2e0ff9360a6d138af2f07f85666bcb
parent40c8b2034a7924b2fc19192aa450f69277853701 (diff)
downloademacs-5a534851893ffbd264a8dd2622169daee6a78f25.tar.gz
emacs-5a534851893ffbd264a8dd2622169daee6a78f25.zip
(compare-windows): Make leading whitespace equivalent
to no leading whitespace, according to IGNORE-WHITESPACE argument.
-rw-r--r--lisp/compare-w.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index 717974b364b..4987f9abc1b 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -99,9 +99,10 @@ If `compare-ignore-case' is non-nil, changes in case are also ignored."
99 (compare-windows-skip-whitespace opoint2) 99 (compare-windows-skip-whitespace opoint2)
100 (funcall skip-whitespace opoint2))) 100 (funcall skip-whitespace opoint2)))
101 (setq p2a (point)) 101 (setq p2a (point))
102 (and result1 result2 (eq result1 result2) 102 (if (or (stringp skip-whitespace)
103 (setq p1 p1a 103 (and result1 result2 (eq result1 result2)))
104 p2 p2a))))) 104 (setq p1 p1a
105 p2 p2a)))))
105 106
106 ;; Try advancing comparing 1000 chars at a time. 107 ;; Try advancing comparing 1000 chars at a time.
107 ;; When that fails, go 500 chars at a time, and so on. 108 ;; When that fails, go 500 chars at a time, and so on.