Merge branch 'emacs-25-merge'

[gnu-emacs] / lisp / vc / compare-w.el

diff --git a/lisp/vc/compare-w.el b/lisp/vc/compare-w.el
index 07c07682186244dc42a8c6d9bb1ae7fc5668880f..d6e3240eaf7627c3646e9ee350956e86cfeed909 100644 (file)
--- a/lisp/vc/compare-w.el
+++ b/lisp/vc/compare-w.el
@@ -88,7 +88,7 @@ regexp containing some field separator or a newline, depending on
 the nature of the difference units separator.  The variable can
 be made buffer-local.
 
-If the value of this variable is `nil' (option \"No sync\"), then
+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))
@@ -132,13 +132,13 @@ out all highlighting later with the command `compare-windows-dehighlight'."
 
 (defface compare-windows-removed
   '((t :inherit diff-removed))
-  "Face for highlighting of compare-windows removed regions."
+  "Face for highlighting `compare-windows' differing regions in the other window."
   :group 'compare-windows
   :version "25.1")
 
 (defface compare-windows-added
   '((t :inherit diff-added))
-  "Face for highlighting of compare-windows added regions."
+  "Face for highlighting `compare-windows' differing regions in current window."
   :group 'compare-windows
   :version "25.1")
 
@@ -150,7 +150,8 @@ out all highlighting later with the command `compare-windows-dehighlight'."
 (defvar compare-windows-overlays2 nil)
 (defvar compare-windows-sync-point nil)
 
-(defcustom compare-windows-get-window-function 'compare-windows-get-recent-window
+(defcustom compare-windows-get-window-function
+  'compare-windows-get-recent-window
   "Function that provides the window to compare with."
   :type '(choice
          (function-item :tag "Most recently used window"
@@ -159,7 +160,7 @@ out all highlighting later with the command `compare-windows-dehighlight'."
                         compare-windows-get-next-window)
          (function :tag "Your function"))
   :group 'compare-windows
-  :version "25.0")
+  :version "25.1")
 
 (defun compare-windows-get-recent-window ()
   "Return the most recently used window.