;;; compare-w.el --- compare text between windows for Emacs.
-;; Copyright (C) 1986, 1989, 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1989, 1993, 1997 Free Software Foundation, Inc.
;; Maintainer: FSF
;;; Code:
-(defvar compare-windows-whitespace "[ \t\n]+"
+(defgroup compare-w nil
+ "Compare text between windows."
+ :prefix "compare-"
+ :group 'tools)
+
+(defcustom compare-windows-whitespace "[ \t\n]+"
"*Regexp that defines whitespace sequences for \\[compare-windows].
Changes in whitespace are optionally ignored.
The function is passed one argument, the point where `compare-windows'
was originally called; it should not consider any text before that point.
If the function returns the same value for both buffers, then the
-whitespace is considered to match, and is skipped.")
+whitespace is considered to match, and is skipped."
+ :type '(choice regexp function)
+ :group 'compare-w)
-(defvar compare-ignore-case nil
- "*Non-nil means \\[compare-windows] ignores case differences.")
+(defcustom compare-ignore-case nil
+ "*Non-nil means \\[compare-windows] ignores case differences."
+ :type 'boolean
+ :group 'compare-w)
;;;###autoload
(defun compare-windows (ignore-whitespace)
compare-windows-whitespace))))
(setq p1 (point) b1 (current-buffer))
(setq w2 (next-window (selected-window)))
+ (if (eq w2 (selected-window))
+ (setq w2 (next-window (selected-window) nil 'visible)))
(if (eq w2 (selected-window))
(error "No other window"))
(setq p2 (window-point w2)
(goto-char p2)
(setq result2 (funcall skip-func opoint2))
(setq p2a (point))
- (if (or (stringp skip-whitespace)
+ (if (or (stringp compare-windows-whitespace)
(and result1 result2 (eq result1 result2)))
(setq p1 p1a
p2 p2a)))))