aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-07-16 13:33:13 +0000
committerRichard M. Stallman2002-07-16 13:33:13 +0000
commit76960e5022301399da7664a42bfa0f99d8d12a9c (patch)
tree32afc1bd0fd9643a6065b2c4cdba108ab8e28b2b
parent7f1fa8585763a837e756e7cab840f1c67c6c32f4 (diff)
downloademacs-76960e5022301399da7664a42bfa0f99d8d12a9c.tar.gz
emacs-76960e5022301399da7664a42bfa0f99d8d12a9c.zip
(compare-windows-whitespace): Always allow newline
even if it does not have whitespace syntax.
-rw-r--r--lisp/compare-w.el17
1 files changed, 9 insertions, 8 deletions
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index ce9a47d62c5..8772cfcc6df 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -36,17 +36,18 @@
36 :prefix "compare-" 36 :prefix "compare-"
37 :group 'tools) 37 :group 'tools)
38 38
39(defcustom compare-windows-whitespace "\\s-+" 39(defcustom compare-windows-whitespace "\\(\\s-\\|\n\\)+"
40 "*Regexp that defines whitespace sequences for \\[compare-windows]. 40 "*Regexp that defines whitespace sequences for \\[compare-windows].
41Changes in whitespace are optionally ignored. 41That command optionally ignores changes in whitespace.
42 42
43The value of `compare-windows-whitespace' may instead be a function; this 43The value of `compare-windows-whitespace' is normally a regexp, but it
44function is called in each buffer, with point at the current scanning point. 44can also be a function. The function's job is to categorize any
45The function's job is to categorize any whitespace around (including before) 45whitespace around (including before) point; it should also advance
46point; it should also advance past any whitespace. 46past any whitespace. The function is called in each buffer, with
47point at the current scanning point. It gets one argument, the point
48where `compare-windows' was originally called; it should not look at
49any text before that point.
47 50
48The function is passed one argument, the point where `compare-windows'
49was originally called; it should not consider any text before that point.
50If the function returns the same value for both buffers, then the 51If the function returns the same value for both buffers, then the
51whitespace is considered to match, and is skipped." 52whitespace is considered to match, and is skipped."
52 :type '(choice regexp function) 53 :type '(choice regexp function)