annotate lisp/compare-w.el @ 15264:0eb55cad57c6

(scroll-bar-maybe-set-window-start): Always set window start, to ensure scroll bar position is updated.
author Karl Heuer <kwzh@gnu.org>
date Tue, 21 May 1996 14:40:27 +0000
parents 83f275dcd93a
children dc0cd1c70c87
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
1 ;;; compare-w.el --- compare text between windows for Emacs.
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
2
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
3 ;; Copyright (C) 1986, 1989, 1993 Free Software Foundation, Inc.
845
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
4
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
5 ;; Maintainer: FSF
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 ;; This file is part of GNU Emacs.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
11 ;; the Free Software Foundation; either version 2, or (at your option)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 ;; any later version.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 ;; GNU Emacs is distributed in the hope that it will be useful,
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; GNU General Public License for more details.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 10031
diff changeset
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 10031
diff changeset
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 10031
diff changeset
22 ;; Boston, MA 02111-1307, USA.
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23
2307
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2011
diff changeset
24 ;;; Commentary:
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2011
diff changeset
25
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2011
diff changeset
26 ;; This package provides one entry point, compare-windows. It compares
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2011
diff changeset
27 ;; text starting from point in two adjacent windows, advancing point
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2011
diff changeset
28 ;; until it finds a difference. Option variables permit you to ignore
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2011
diff changeset
29 ;; whitespace differences, or case differences, or both.
10e417efb12a Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2011
diff changeset
30
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
31 ;;; Code:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 662
diff changeset
32
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
33 (defvar compare-windows-whitespace "[ \t\n]+"
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
34 "*Regexp that defines whitespace sequences for \\[compare-windows].
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 Changes in whitespace are optionally ignored.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
37 The value of `compare-windows-whitespace' may instead be a function; this
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 function is called in each buffer, with point at the current scanning point.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 The function's job is to categorize any whitespace around (including before)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
40 point; it should also advance past any whitespace.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42 The function is passed one argument, the point where `compare-windows'
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 was originally called; it should not consider any text before that point.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 If the function returns the same value for both buffers, then the
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 whitespace is considered to match, and is skipped.")
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47 (defvar compare-ignore-case nil
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48 "*Non-nil means \\[compare-windows] ignores case differences.")
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
49
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50 ;;;###autoload
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
51 (defun compare-windows (ignore-whitespace)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
52 "Compare text in current window with text in next window.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53 Compares the text starting at point in each window,
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 moving over text in each one as far as they match.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
55
10031
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
56 This command pushes the mark in each window
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
57 at the prior location of point in that window.
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
58 If both windows display the same buffer,
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
59 the mark is pushed twice in that buffer:
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
60 first in the other window, then in the selected window.
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
61
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
62 A prefix arg means ignore changes in whitespace.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
63 The variable `compare-windows-whitespace' controls how whitespace is skipped.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
64 If `compare-ignore-case' is non-nil, changes in case are also ignored."
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
65 (interactive "P")
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66 (let* (p1 p2 maxp1 maxp2 b1 b2 w2
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
67 success size
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
68 (opoint1 (point))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
69 opoint2
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
70 (skip-whitespace (if ignore-whitespace
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
71 compare-windows-whitespace)))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
72 (setq p1 (point) b1 (current-buffer))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
73 (setq w2 (next-window (selected-window)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
74 (if (eq w2 (selected-window))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
75 (error "No other window"))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
76 (setq p2 (window-point w2)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
77 b2 (window-buffer w2))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
78 (setq opoint2 p2)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
79 (setq maxp1 (point-max))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
80 (save-excursion
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
81 (set-buffer b2)
10031
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
82 (push-mark p2 t)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
83 (setq maxp2 (point-max)))
10031
324e027f01bc (compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents: 7701
diff changeset
84 (push-mark)
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86 (setq success t)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
87 (while success
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
88 (setq success nil)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
89 ;; if interrupted, show how far we've gotten
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
90 (goto-char p1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
91 (set-window-point w2 p2)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
92
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
93 ;; If both buffers have whitespace next to point,
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
94 ;; optionally skip over it.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
95
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 (and skip-whitespace
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97 (save-excursion
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98 (let (p1a p2a w1 w2 result1 result2)
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
99 (setq result1
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
100 (if (stringp skip-whitespace)
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
101 (compare-windows-skip-whitespace opoint1)
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
102 (funcall skip-whitespace opoint1)))
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
103 (setq p1a (point))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104 (set-buffer b2)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 (goto-char p2)
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
106 (setq result2
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
107 (if (stringp skip-whitespace)
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
108 (compare-windows-skip-whitespace opoint2)
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
109 (funcall skip-whitespace opoint2)))
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
110 (setq p2a (point))
7701
ec15948b9458 (compare-windows): Make leading whitespace equivalent
Richard M. Stallman <rms@gnu.org>
parents: 5005
diff changeset
111 (if (or (stringp skip-whitespace)
ec15948b9458 (compare-windows): Make leading whitespace equivalent
Richard M. Stallman <rms@gnu.org>
parents: 5005
diff changeset
112 (and result1 result2 (eq result1 result2)))
ec15948b9458 (compare-windows): Make leading whitespace equivalent
Richard M. Stallman <rms@gnu.org>
parents: 5005
diff changeset
113 (setq p1 p1a
ec15948b9458 (compare-windows): Make leading whitespace equivalent
Richard M. Stallman <rms@gnu.org>
parents: 5005
diff changeset
114 p2 p2a)))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
116 ;; Try advancing comparing 1000 chars at a time.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 ;; When that fails, go 500 chars at a time, and so on.
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118 (let ((size 1000)
2011
eea183a35396 (compare-windows): Use compare-buffer-substrings.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
119 success-1
eea183a35396 (compare-windows): Use compare-buffer-substrings.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
120 (case-fold-search compare-ignore-case))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121 (while (> size 0)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
122 (setq success-1 t)
2011
eea183a35396 (compare-windows): Use compare-buffer-substrings.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
123 ;; Try comparing SIZE chars at a time, repeatedly, till that fails.
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124 (while success-1
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
125 (setq size (min size (- maxp1 p1) (- maxp2 p2)))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126 (setq success-1
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 (and (> size 0)
2011
eea183a35396 (compare-windows): Use compare-buffer-substrings.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
128 (= 0 (compare-buffer-substrings b2 p2 (+ size p2)
eea183a35396 (compare-windows): Use compare-buffer-substrings.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
129 b1 p1 (+ size p1)))))
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
130 (if success-1
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
131 (setq p1 (+ p1 size) p2 (+ p2 size)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
132 success t)))
2011
eea183a35396 (compare-windows): Use compare-buffer-substrings.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
133 ;; If SIZE chars don't match, try fewer.
257
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
134 (setq size (/ size 2)))))
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
135
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 (goto-char p1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137 (set-window-point w2 p2)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
138 (if (= (point) opoint1)
e5ba2ba35226 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
139 (ding))))
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 257
diff changeset
140
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
141 ;; Move forward over whatever might be called whitespace.
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
142 ;; compare-windows-whitespace is a regexp that matches whitespace.
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
143 ;; Match it at various starting points before the original point
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
144 ;; and find the latest point at which a match ends.
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
145 ;; Don't try starting points before START, though.
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
146 ;; Value is non-nil if whitespace is found.
4925
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
147
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
148 ;; If there is whitespace before point, but none after,
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
149 ;; then return t, but don't advance point.
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
150 (defun compare-windows-skip-whitespace (start)
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
151 (let ((end (point))
4925
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
152 (beg (point))
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
153 (opoint (point)))
5005
c762abae3964 (compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents: 4925
diff changeset
154 (while (or (and (looking-at compare-windows-whitespace)
4925
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
155 (<= end (match-end 0))
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
156 ;; This match goes past END, so advance END.
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
157 (progn (setq end (match-end 0))
5005
c762abae3964 (compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents: 4925
diff changeset
158 (> (point) start)))
c762abae3964 (compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents: 4925
diff changeset
159 (and (/= (point) start)
c762abae3964 (compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents: 4925
diff changeset
160 ;; Consider at least the char before point,
c762abae3964 (compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents: 4925
diff changeset
161 ;; unless it is also before START.
c762abae3964 (compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents: 4925
diff changeset
162 (= (point) opoint)))
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
163 ;; keep going back until whitespace
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
164 ;; doesn't extend to or past end
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
165 (forward-char -1))
4925
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
166 (setq beg (point))
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
167 (goto-char end)
4925
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
168 (or (/= beg opoint)
76fb8b35df3f (compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents: 4072
diff changeset
169 (/= end opoint))))
4072
d38c94145afe (compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2307
diff changeset
170
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 257
diff changeset
171 (provide 'compare-w)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 257
diff changeset
172
662
8a533acedb77 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
173 ;;; compare-w.el ends here