2001-07-15 16:15:35 +00:00
|
|
|
;;; compare-w.el --- compare text between windows for Emacs
|
1992-05-30 23:54:21 +00:00
|
|
|
|
1997-02-09 23:02:19 +00:00
|
|
|
;; Copyright (C) 1986, 1989, 1993, 1997 Free Software Foundation, Inc.
|
1991-05-09 21:50:45 +00:00
|
|
|
|
1992-07-22 04:22:30 +00:00
|
|
|
;; Maintainer: FSF
|
2002-05-02 05:41:46 +00:00
|
|
|
;; Keywords: convenience files
|
1992-07-22 04:22:30 +00:00
|
|
|
|
1991-05-09 21:50:45 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
1992-07-16 21:47:34 +00:00
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
1991-05-09 21:50:45 +00:00
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
1996-01-14 07:34:30 +00:00
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
|
|
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
;; Boston, MA 02111-1307, USA.
|
1991-05-09 21:50:45 +00:00
|
|
|
|
1993-03-22 03:27:18 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; This package provides one entry point, compare-windows. It compares
|
|
|
|
;; text starting from point in two adjacent windows, advancing point
|
|
|
|
;; until it finds a difference. Option variables permit you to ignore
|
|
|
|
;; whitespace differences, or case differences, or both.
|
|
|
|
|
1992-07-16 21:47:34 +00:00
|
|
|
;;; Code:
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
(defgroup compare-w nil
|
|
|
|
"Compare text between windows."
|
|
|
|
:prefix "compare-"
|
|
|
|
:group 'tools)
|
|
|
|
|
2002-07-16 13:33:13 +00:00
|
|
|
(defcustom compare-windows-whitespace "\\(\\s-\\|\n\\)+"
|
1993-07-13 07:31:09 +00:00
|
|
|
"*Regexp that defines whitespace sequences for \\[compare-windows].
|
2002-07-16 13:33:13 +00:00
|
|
|
That command optionally ignores changes in whitespace.
|
1991-05-09 21:50:45 +00:00
|
|
|
|
2002-07-16 13:33:13 +00:00
|
|
|
The value of `compare-windows-whitespace' is normally a regexp, but it
|
|
|
|
can also be a function. The function's job is to categorize any
|
|
|
|
whitespace around (including before) point; it should also advance
|
|
|
|
past any whitespace. The function is called in each buffer, with
|
|
|
|
point at the current scanning point. It gets one argument, the point
|
|
|
|
where `compare-windows' was originally called; it should not look at
|
|
|
|
any text before that point.
|
1991-05-09 21:50:45 +00:00
|
|
|
|
|
|
|
If the function returns the same value for both buffers, then the
|
1998-03-07 18:19:38 +00:00
|
|
|
whitespace is considered to match, and is skipped."
|
|
|
|
:type '(choice regexp function)
|
|
|
|
:group 'compare-w)
|
1991-05-09 21:50:45 +00:00
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
(defcustom compare-ignore-case nil
|
|
|
|
"*Non-nil means \\[compare-windows] ignores case differences."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'compare-w)
|
1991-05-09 21:50:45 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun compare-windows (ignore-whitespace)
|
|
|
|
"Compare text in current window with text in next window.
|
|
|
|
Compares the text starting at point in each window,
|
|
|
|
moving over text in each one as far as they match.
|
|
|
|
|
1994-11-20 21:55:55 +00:00
|
|
|
This command pushes the mark in each window
|
|
|
|
at the prior location of point in that window.
|
|
|
|
If both windows display the same buffer,
|
|
|
|
the mark is pushed twice in that buffer:
|
|
|
|
first in the other window, then in the selected window.
|
|
|
|
|
1991-05-09 21:50:45 +00:00
|
|
|
A prefix arg means ignore changes in whitespace.
|
|
|
|
The variable `compare-windows-whitespace' controls how whitespace is skipped.
|
|
|
|
If `compare-ignore-case' is non-nil, changes in case are also ignored."
|
|
|
|
(interactive "P")
|
|
|
|
(let* (p1 p2 maxp1 maxp2 b1 b2 w2
|
1997-02-09 22:55:17 +00:00
|
|
|
(progress 1)
|
1991-05-09 21:50:45 +00:00
|
|
|
(opoint1 (point))
|
|
|
|
opoint2
|
1997-02-09 22:55:17 +00:00
|
|
|
(skip-func (if ignore-whitespace
|
|
|
|
(if (stringp compare-windows-whitespace)
|
|
|
|
'compare-windows-skip-whitespace
|
|
|
|
compare-windows-whitespace))))
|
1991-05-09 21:50:45 +00:00
|
|
|
(setq p1 (point) b1 (current-buffer))
|
1999-07-14 08:16:49 +00:00
|
|
|
(setq w2 (next-window (selected-window)))
|
|
|
|
(if (eq w2 (selected-window))
|
|
|
|
(setq w2 (next-window (selected-window) nil 'visible)))
|
1991-05-09 21:50:45 +00:00
|
|
|
(if (eq w2 (selected-window))
|
|
|
|
(error "No other window"))
|
|
|
|
(setq p2 (window-point w2)
|
|
|
|
b2 (window-buffer w2))
|
|
|
|
(setq opoint2 p2)
|
|
|
|
(setq maxp1 (point-max))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer b2)
|
1994-11-20 21:55:55 +00:00
|
|
|
(push-mark p2 t)
|
1991-05-09 21:50:45 +00:00
|
|
|
(setq maxp2 (point-max)))
|
1994-11-20 21:55:55 +00:00
|
|
|
(push-mark)
|
1991-05-09 21:50:45 +00:00
|
|
|
|
1997-02-09 22:55:17 +00:00
|
|
|
(while (> progress 0)
|
1991-05-09 21:50:45 +00:00
|
|
|
;; If both buffers have whitespace next to point,
|
|
|
|
;; optionally skip over it.
|
|
|
|
|
1997-02-09 22:55:17 +00:00
|
|
|
(and skip-func
|
1991-05-09 21:50:45 +00:00
|
|
|
(save-excursion
|
|
|
|
(let (p1a p2a w1 w2 result1 result2)
|
1997-02-09 22:55:17 +00:00
|
|
|
(setq result1 (funcall skip-func opoint1))
|
1993-07-13 07:31:09 +00:00
|
|
|
(setq p1a (point))
|
1991-05-09 21:50:45 +00:00
|
|
|
(set-buffer b2)
|
|
|
|
(goto-char p2)
|
1997-02-09 22:55:17 +00:00
|
|
|
(setq result2 (funcall skip-func opoint2))
|
1993-07-13 07:31:09 +00:00
|
|
|
(setq p2a (point))
|
1997-02-09 23:02:19 +00:00
|
|
|
(if (or (stringp compare-windows-whitespace)
|
1994-05-27 07:10:56 +00:00
|
|
|
(and result1 result2 (eq result1 result2)))
|
|
|
|
(setq p1 p1a
|
|
|
|
p2 p2a)))))
|
1991-05-09 21:50:45 +00:00
|
|
|
|
1997-02-09 22:55:17 +00:00
|
|
|
(let ((size (min (- maxp1 p1) (- maxp2 p2)))
|
1993-03-05 20:37:00 +00:00
|
|
|
(case-fold-search compare-ignore-case))
|
1997-02-09 22:55:17 +00:00
|
|
|
(setq progress (compare-buffer-substrings b2 p2 (+ size p2)
|
|
|
|
b1 p1 (+ size p1)))
|
|
|
|
(setq progress (if (zerop progress) size (1- (abs progress))))
|
|
|
|
(setq p1 (+ p1 progress) p2 (+ p2 progress)))
|
|
|
|
;; Advance point now rather than later, in case we're interrupted.
|
|
|
|
(goto-char p1)
|
|
|
|
(set-window-point w2 p2))
|
|
|
|
|
1991-05-09 21:50:45 +00:00
|
|
|
(if (= (point) opoint1)
|
|
|
|
(ding))))
|
1992-03-16 20:39:07 +00:00
|
|
|
|
1993-07-13 07:31:09 +00:00
|
|
|
;; Move forward over whatever might be called whitespace.
|
|
|
|
;; compare-windows-whitespace is a regexp that matches whitespace.
|
|
|
|
;; Match it at various starting points before the original point
|
|
|
|
;; and find the latest point at which a match ends.
|
|
|
|
;; Don't try starting points before START, though.
|
|
|
|
;; Value is non-nil if whitespace is found.
|
1993-11-07 22:19:57 +00:00
|
|
|
|
|
|
|
;; If there is whitespace before point, but none after,
|
|
|
|
;; then return t, but don't advance point.
|
1993-07-13 07:31:09 +00:00
|
|
|
(defun compare-windows-skip-whitespace (start)
|
|
|
|
(let ((end (point))
|
1993-11-07 22:19:57 +00:00
|
|
|
(beg (point))
|
1993-07-13 07:31:09 +00:00
|
|
|
(opoint (point)))
|
1993-11-14 02:56:24 +00:00
|
|
|
(while (or (and (looking-at compare-windows-whitespace)
|
1993-11-07 22:19:57 +00:00
|
|
|
(<= end (match-end 0))
|
|
|
|
;; This match goes past END, so advance END.
|
|
|
|
(progn (setq end (match-end 0))
|
1993-11-14 02:56:24 +00:00
|
|
|
(> (point) start)))
|
|
|
|
(and (/= (point) start)
|
|
|
|
;; Consider at least the char before point,
|
|
|
|
;; unless it is also before START.
|
|
|
|
(= (point) opoint)))
|
1993-07-13 07:31:09 +00:00
|
|
|
;; keep going back until whitespace
|
|
|
|
;; doesn't extend to or past end
|
|
|
|
(forward-char -1))
|
1993-11-07 22:19:57 +00:00
|
|
|
(setq beg (point))
|
1993-07-13 07:31:09 +00:00
|
|
|
(goto-char end)
|
1993-11-07 22:19:57 +00:00
|
|
|
(or (/= beg opoint)
|
|
|
|
(/= end opoint))))
|
1993-07-13 07:31:09 +00:00
|
|
|
|
1992-03-16 20:39:07 +00:00
|
|
|
(provide 'compare-w)
|
|
|
|
|
1992-05-30 23:54:21 +00:00
|
|
|
;;; compare-w.el ends here
|