mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-17 18:37:33 +00:00
(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.
This commit is contained in:
parent
cc8b76bf86
commit
1dbe7fe78d
1 changed files with 13 additions and 13 deletions
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue