Mercurial > emacs
annotate lisp/compare-w.el @ 20895:896aeeb4f735
(Fsubst_char_in_region): Don't increment pos twice.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sat, 14 Feb 1998 07:27:29 +0000 |
parents | 653ef38fd02e |
children | ac1673121774 |
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 |
16987 | 3 ;; Copyright (C) 1986, 1989, 1993, 1997 Free Software Foundation, Inc. |
845 | 4 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
662
diff
changeset
|
5 ;; Maintainer: FSF |
257 | 6 |
7 ;; This file is part of GNU Emacs. | |
8 | |
9 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
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 | 12 ;; any later version. |
13 | |
14 ;; GNU Emacs is distributed in the hope that it will be useful, | |
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 ;; GNU General Public License for more details. | |
18 | |
19 ;; You should have received a copy of the GNU General Public License | |
14169 | 20 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 ;; Boston, MA 02111-1307, USA. | |
257 | 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 | 35 Changes in whitespace are optionally ignored. |
36 | |
37 The value of `compare-windows-whitespace' may instead be a function; this | |
38 function is called in each buffer, with point at the current scanning point. | |
39 The function's job is to categorize any whitespace around (including before) | |
40 point; it should also advance past any whitespace. | |
41 | |
42 The function is passed one argument, the point where `compare-windows' | |
43 was originally called; it should not consider any text before that point. | |
44 If the function returns the same value for both buffers, then the | |
45 whitespace is considered to match, and is skipped.") | |
46 | |
47 (defvar compare-ignore-case nil | |
48 "*Non-nil means \\[compare-windows] ignores case differences.") | |
49 | |
50 ;;;###autoload | |
51 (defun compare-windows (ignore-whitespace) | |
52 "Compare text in current window with text in next window. | |
53 Compares the text starting at point in each window, | |
54 moving over text in each one as far as they match. | |
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 | 62 A prefix arg means ignore changes in whitespace. |
63 The variable `compare-windows-whitespace' controls how whitespace is skipped. | |
64 If `compare-ignore-case' is non-nil, changes in case are also ignored." | |
65 (interactive "P") | |
66 (let* (p1 p2 maxp1 maxp2 b1 b2 w2 | |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
67 (progress 1) |
257 | 68 (opoint1 (point)) |
69 opoint2 | |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
70 (skip-func (if ignore-whitespace |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
71 (if (stringp compare-windows-whitespace) |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
72 'compare-windows-skip-whitespace |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
73 compare-windows-whitespace)))) |
257 | 74 (setq p1 (point) b1 (current-buffer)) |
17542
653ef38fd02e
(compare-windows): Allow windows on different frames.
Richard M. Stallman <rms@gnu.org>
parents:
16987
diff
changeset
|
75 (setq w2 (next-window (selected-window) nil 'visible)) |
257 | 76 (if (eq w2 (selected-window)) |
77 (error "No other window")) | |
78 (setq p2 (window-point w2) | |
79 b2 (window-buffer w2)) | |
80 (setq opoint2 p2) | |
81 (setq maxp1 (point-max)) | |
82 (save-excursion | |
83 (set-buffer b2) | |
10031
324e027f01bc
(compare-windows): Push mark in both buffers at start.
Richard M. Stallman <rms@gnu.org>
parents:
7701
diff
changeset
|
84 (push-mark p2 t) |
257 | 85 (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
|
86 (push-mark) |
257 | 87 |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
88 (while (> progress 0) |
257 | 89 ;; If both buffers have whitespace next to point, |
90 ;; optionally skip over it. | |
91 | |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
92 (and skip-func |
257 | 93 (save-excursion |
94 (let (p1a p2a w1 w2 result1 result2) | |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
95 (setq result1 (funcall skip-func opoint1)) |
4072
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
96 (setq p1a (point)) |
257 | 97 (set-buffer b2) |
98 (goto-char p2) | |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
99 (setq result2 (funcall skip-func opoint2)) |
4072
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
100 (setq p2a (point)) |
16987 | 101 (if (or (stringp compare-windows-whitespace) |
7701
ec15948b9458
(compare-windows): Make leading whitespace equivalent
Richard M. Stallman <rms@gnu.org>
parents:
5005
diff
changeset
|
102 (and result1 result2 (eq result1 result2))) |
ec15948b9458
(compare-windows): Make leading whitespace equivalent
Richard M. Stallman <rms@gnu.org>
parents:
5005
diff
changeset
|
103 (setq p1 p1a |
ec15948b9458
(compare-windows): Make leading whitespace equivalent
Richard M. Stallman <rms@gnu.org>
parents:
5005
diff
changeset
|
104 p2 p2a))))) |
257 | 105 |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
106 (let ((size (min (- maxp1 p1) (- maxp2 p2))) |
2011
eea183a35396
(compare-windows): Use compare-buffer-substrings.
Richard M. Stallman <rms@gnu.org>
parents:
845
diff
changeset
|
107 (case-fold-search compare-ignore-case)) |
16986
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
108 (setq progress (compare-buffer-substrings b2 p2 (+ size p2) |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
109 b1 p1 (+ size p1))) |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
110 (setq progress (if (zerop progress) size (1- (abs progress)))) |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
111 (setq p1 (+ p1 progress) p2 (+ p2 progress))) |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
112 ;; Advance point now rather than later, in case we're interrupted. |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
113 (goto-char p1) |
dc0cd1c70c87
(compare-windows): Make more efficient use of
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
114 (set-window-point w2 p2)) |
257 | 115 |
116 (if (= (point) opoint1) | |
117 (ding)))) | |
584 | 118 |
4072
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
119 ;; 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
|
120 ;; 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
|
121 ;; 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
|
122 ;; 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
|
123 ;; 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
|
124 ;; 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
|
125 |
76fb8b35df3f
(compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents:
4072
diff
changeset
|
126 ;; 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
|
127 ;; 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
|
128 (defun compare-windows-skip-whitespace (start) |
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
129 (let ((end (point)) |
4925
76fb8b35df3f
(compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents:
4072
diff
changeset
|
130 (beg (point)) |
4072
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
131 (opoint (point))) |
5005
c762abae3964
(compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents:
4925
diff
changeset
|
132 (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
|
133 (<= end (match-end 0)) |
76fb8b35df3f
(compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents:
4072
diff
changeset
|
134 ;; 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
|
135 (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
|
136 (> (point) start))) |
c762abae3964
(compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents:
4925
diff
changeset
|
137 (and (/= (point) start) |
c762abae3964
(compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents:
4925
diff
changeset
|
138 ;; 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
|
139 ;; unless it is also before START. |
c762abae3964
(compare-windows-skip-whitespace): Swap the two
Richard M. Stallman <rms@gnu.org>
parents:
4925
diff
changeset
|
140 (= (point) opoint))) |
4072
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
141 ;; keep going back until whitespace |
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
142 ;; doesn't extend to or past end |
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
143 (forward-char -1)) |
4925
76fb8b35df3f
(compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents:
4072
diff
changeset
|
144 (setq beg (point)) |
4072
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
145 (goto-char end) |
4925
76fb8b35df3f
(compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents:
4072
diff
changeset
|
146 (or (/= beg opoint) |
76fb8b35df3f
(compare-windows-skip-whitespace): Return t
Richard M. Stallman <rms@gnu.org>
parents:
4072
diff
changeset
|
147 (/= end opoint)))) |
4072
d38c94145afe
(compare-windows-skip-whitespace): New function.
Richard M. Stallman <rms@gnu.org>
parents:
2307
diff
changeset
|
148 |
584 | 149 (provide 'compare-w) |
150 | |
662
8a533acedb77
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
151 ;;; compare-w.el ends here |