diff options
| -rw-r--r-- | lisp/compare-w.el | 26 |
1 files changed, 13 insertions, 13 deletions
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." | |||
| 56 | (defcustom compare-ignore-whitespace nil | 56 | (defcustom compare-ignore-whitespace nil |
| 57 | "*Non-nil means `compare-windows' ignores whitespace." | 57 | "*Non-nil means `compare-windows' ignores whitespace." |
| 58 | :type 'boolean | 58 | :type 'boolean |
| 59 | :group 'compare-w) | 59 | :group 'compare-w |
| 60 | :version "22.1") | ||
| 60 | 61 | ||
| 61 | (defcustom compare-ignore-case nil | 62 | (defcustom compare-ignore-case nil |
| 62 | "*Non-nil means `compare-windows' ignores case differences." | 63 | "*Non-nil means `compare-windows' ignores case differences." |
| @@ -88,7 +89,8 @@ be made buffer-local. | |||
| 88 | If the value of this variable is `nil', then function `ding' is | 89 | If the value of this variable is `nil', then function `ding' is |
| 89 | called to beep or flash the screen when points are mismatched." | 90 | called to beep or flash the screen when points are mismatched." |
| 90 | :type '(choice regexp function) | 91 | :type '(choice regexp function) |
| 91 | :group 'compare-w) | 92 | :group 'compare-w |
| 93 | :version "22.1") | ||
| 92 | 94 | ||
| 93 | (defcustom compare-windows-sync-string-size 32 | 95 | (defcustom compare-windows-sync-string-size 32 |
| 94 | "*Size of string from one window that is searched in second window. | 96 | "*Size of string from one window that is searched in second window. |
| @@ -99,7 +101,8 @@ difference regions more coarse-grained. | |||
| 99 | 101 | ||
| 100 | The default value 32 is good for the most cases." | 102 | The default value 32 is good for the most cases." |
| 101 | :type 'integer | 103 | :type 'integer |
| 102 | :group 'compare-w) | 104 | :group 'compare-w |
| 105 | :version "22.1") | ||
| 103 | 106 | ||
| 104 | (defcustom compare-windows-recenter nil | 107 | (defcustom compare-windows-recenter nil |
| 105 | "*List of two values, each of which is used as argument of | 108 | "*List of two values, each of which is used as argument of |
| @@ -109,23 +112,20 @@ matching points side-by-side. | |||
| 109 | The value `(-1 0)' is useful if windows are split vertically, | 112 | The value `(-1 0)' is useful if windows are split vertically, |
| 110 | and the value `((4) (4))' for horizontally split windows." | 113 | and the value `((4) (4))' for horizontally split windows." |
| 111 | :type '(list sexp sexp) | 114 | :type '(list sexp sexp) |
| 112 | :group 'compare-w) | 115 | :group 'compare-w |
| 116 | :version "22.1") | ||
| 113 | 117 | ||
| 114 | (defcustom compare-windows-highlight t | 118 | (defcustom compare-windows-highlight t |
| 115 | "*Non-nil means compare-windows highlights the differences." | 119 | "*Non-nil means compare-windows highlights the differences." |
| 116 | :type 'boolean | 120 | :type 'boolean |
| 117 | :group 'compare-w) | 121 | :group 'compare-w |
| 122 | :version "22.1") | ||
| 118 | 123 | ||
| 119 | (defface compare-windows | 124 | (defface compare-windows |
| 120 | '((((class color) (min-colors 88) (background light)) | 125 | '((t :inherit lazy-highlight)) |
| 121 | (:background "paleturquoise")) | ||
| 122 | (((class color) (min-colors 88) (background dark)) | ||
| 123 | (:background "paleturquoise4")) | ||
| 124 | (((class color)) | ||
| 125 | (:background "turquoise3")) | ||
| 126 | (t (:underline t))) | ||
| 127 | "Face for highlighting of compare-windows difference regions." | 126 | "Face for highlighting of compare-windows difference regions." |
| 128 | :group 'compare-w) | 127 | :group 'compare-w |
| 128 | :version "22.1") | ||
| 129 | ;; backward-compatibility alias | 129 | ;; backward-compatibility alias |
| 130 | (put 'compare-windows-face 'face-alias 'compare-windows) | 130 | (put 'compare-windows-face 'face-alias 'compare-windows) |
| 131 | 131 | ||