From: Juri Linkov <juri@jurta.org>
Date: Tue, 19 Jul 2005 11:19:13 +0000 (+0000)
Subject: (compare-ignore-whitespace, compare-windows-sync)
X-Git-Tag: emacs-pretest-22.0.90~8000
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1dbe7fe78dbd4e9a6777d42ab0e8ba353b636a87;p=emacs.git

(compare-ignore-whitespace, compare-windows-sync)
(compare-windows-sync-string-size, compare-windows-recenter)
(compare-windows-highlight, compare-windows): Add version 22.1.
(compare-windows) <defface>: Inherit from lazy-highlight instead
of duplicating its default value.
---

diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index e0a6d5cf732..4bbed1e1fa8 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -56,7 +56,8 @@ whitespace is considered to match, and is skipped."
 (defcustom compare-ignore-whitespace nil
   "*Non-nil means `compare-windows' ignores whitespace."
   :type 'boolean
-  :group 'compare-w)
+  :group 'compare-w
+  :version "22.1")
 
 (defcustom compare-ignore-case nil
   "*Non-nil means `compare-windows' ignores case differences."
@@ -88,7 +89,8 @@ be made buffer-local.
 If the value of this variable is `nil', then function `ding' is
 called to beep or flash the screen when points are mismatched."
   :type '(choice regexp function)
-  :group 'compare-w)
+  :group 'compare-w
+  :version "22.1")
 
 (defcustom compare-windows-sync-string-size 32
   "*Size of string from one window that is searched in second window.
@@ -99,7 +101,8 @@ difference regions more coarse-grained.
 
 The default value 32 is good for the most cases."
   :type 'integer
-  :group 'compare-w)
+  :group 'compare-w
+  :version "22.1")
 
 (defcustom compare-windows-recenter nil
   "*List of two values, each of which is used as argument of
@@ -109,23 +112,20 @@ matching points side-by-side.
 The value `(-1 0)' is useful if windows are split vertically,
 and the value `((4) (4))' for horizontally split windows."
   :type '(list sexp sexp)
-  :group 'compare-w)
+  :group 'compare-w
+  :version "22.1")
 
 (defcustom compare-windows-highlight t
   "*Non-nil means compare-windows highlights the differences."
   :type 'boolean
-  :group 'compare-w)
+  :group 'compare-w
+  :version "22.1")
 
 (defface compare-windows
-  '((((class color) (min-colors 88) (background light))
-     (:background "paleturquoise"))
-    (((class color) (min-colors 88) (background dark))
-     (:background "paleturquoise4"))
-    (((class color))
-     (:background "turquoise3"))
-    (t (:underline t)))
+  '((t :inherit lazy-highlight))
   "Face for highlighting of compare-windows difference regions."
-  :group 'compare-w)
+  :group 'compare-w
+  :version "22.1")
 ;; backward-compatibility alias
 (put 'compare-windows-face 'face-alias 'compare-windows)