aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-08-17 15:22:21 +0000
committerRichard M. Stallman2006-08-17 15:22:21 +0000
commitfb5422b2d186d61a86cc5aa3ca8c502cf6988409 (patch)
tree9da48512d79ba0311a407d07cd13e7a84c128730
parent9fd762b0633b14c6d065b2b448f57a2d62663ad6 (diff)
downloademacs-fb5422b2d186d61a86cc5aa3ca8c502cf6988409.tar.gz
emacs-fb5422b2d186d61a86cc5aa3ca8c502cf6988409.zip
(compare-windows): lambda's take an arg and pass
it to compare-windows-skip-whitespace.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/compare-w.el6
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bec7cab8a3a..f62e924ffaf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-08-17 Richard Stallman <rms@gnu.org>
2
3 * compare-w.el (compare-windows): lambda's take an arg and pass
4 it to compare-windows-skip-whitespace.
5
12006-08-17 Martin Rudalics <rudalics@gmx.at> 62006-08-17 Martin Rudalics <rudalics@gmx.at>
2 7
3 * jit-lock.el (jit-lock-fontify-now): Protect the modified status of 8 * jit-lock.el (jit-lock-fontify-now): Protect the modified status of
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index 3aa01424fb5..8dc0ac1e330 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -191,14 +191,16 @@ on third call it again advances points to the next difference and so on."
191 191
192 (setq skip-func-1 (if ignore-whitespace 192 (setq skip-func-1 (if ignore-whitespace
193 (if (stringp compare-windows-whitespace) 193 (if (stringp compare-windows-whitespace)
194 (lambda () (compare-windows-skip-whitespace) 194 (lambda (pos)
195 (compare-windows-skip-whitespace pos)
195 t) 196 t)
196 compare-windows-whitespace))) 197 compare-windows-whitespace)))
197 198
198 (with-current-buffer b2 199 (with-current-buffer b2
199 (setq skip-func-2 (if ignore-whitespace 200 (setq skip-func-2 (if ignore-whitespace
200 (if (stringp compare-windows-whitespace) 201 (if (stringp compare-windows-whitespace)
201 (lambda () (compare-windows-skip-whitespace) 202 (lambda (pos)
203 (compare-windows-skip-whitespace pos)
202 t) 204 t)
203 compare-windows-whitespace))) 205 compare-windows-whitespace)))
204 (push-mark p2 t) 206 (push-mark p2 t)