[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/compare-w.el,v
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/compare-w.el,v |
Date: |
Sun, 25 Mar 2007 09:28:52 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juri Linkov <jurta> 07/03/25 09:28:52
Index: compare-w.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/compare-w.el,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- compare-w.el 21 Jan 2007 03:53:12 -0000 1.38
+++ compare-w.el 25 Mar 2007 09:28:52 -0000 1.39
@@ -32,7 +32,7 @@
;;; Code:
-(defgroup compare-w nil
+(defgroup compare-windows nil
"Compare text between windows."
:prefix "compare-"
:group 'tools)
@@ -52,18 +52,18 @@
If the function returns the same value for both windows, then the
whitespace is considered to match, and is skipped."
:type '(choice regexp function)
- :group 'compare-w)
+ :group 'compare-windows)
(defcustom compare-ignore-whitespace nil
"*Non-nil means `compare-windows' ignores whitespace."
:type 'boolean
- :group 'compare-w
+ :group 'compare-windows
:version "22.1")
(defcustom compare-ignore-case nil
"*Non-nil means `compare-windows' ignores case differences."
:type 'boolean
- :group 'compare-w)
+ :group 'compare-windows)
(defcustom compare-windows-sync 'compare-windows-sync-default-function
"*Function or regexp that is used to synchronize points in two
@@ -87,10 +87,11 @@
the nature of the difference units separator. The variable can
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
+If the value of this variable is `nil' (option \"No sync\"), then
+no synchronization is performed, and the function `ding' is called
+to beep or flash the screen when points are mismatched."
+ :type '(choice function regexp (const :tag "No sync" nil))
+ :group 'compare-windows
:version "22.1")
(defcustom compare-windows-sync-string-size 32
@@ -102,7 +103,7 @@
The default value 32 is good for the most cases."
:type 'integer
- :group 'compare-w
+ :group 'compare-windows
:version "22.1")
(defcustom compare-windows-recenter nil
@@ -113,7 +114,7 @@
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-windows
:version "22.1")
(defcustom compare-windows-highlight t
@@ -125,13 +126,13 @@
:type '(choice (const :tag "No highlighting" nil)
(const :tag "Persistent highlighting" persistent)
(other :tag "Highlight until next command" t))
- :group 'compare-w
+ :group 'compare-windows
:version "22.1")
(defface compare-windows
'((t :inherit lazy-highlight))
"Face for highlighting of compare-windows difference regions."
- :group 'compare-w
+ :group 'compare-windows
:version "22.1")
(defvar compare-windows-overlay1 nil)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/compare-w.el,v,
Juri Linkov <=