From a72a9fbbbc9cd5f5933719b11489c2578eb0aa59 Mon Sep 17 00:00:00 2001
From: Alan Mackenzie <acm@muc.de>
Date: Fri, 18 Dec 2015 10:40:49 +0000
Subject: [PATCH] Rename `recenter-group' to `recenter-window-group'

* doc/lispref/windows.texi (Textual Scrolling)
* lisp/window.el (top level, recenter-group)
* lisp/follow.el (follow-mode)
* lisp/isearch.el (isearch-back-into-window): Rename `recenter-group' to
`recenter-window-group' and `recenter-group-function' to
`recenter-window-group-function'.
---
 doc/lispref/windows.texi | 13 +++++++------
 lisp/follow.el           |  4 ++--
 lisp/isearch.el          |  8 ++++----
 lisp/window.el           | 12 ++++++------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 0c0c1bce3b9..e45201b0570 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -3546,14 +3546,15 @@ the top of the window.  The command @code{recenter-top-bottom} offers
 a more convenient way to achieve this.
 @end deffn
 
-@vindex recenter-group-function
-@defun recenter-group &optional count
+@vindex recenter-window-group-function
+@defun recenter-window-group &optional count
 This function is like @code{recenter}, except that when the selected
 window is part of a group of windows (@pxref{Window Group}),
-@code{recenter-group} scrolls the entire group.  This condition holds
-when the buffer local variable @code{recenter-group-function} is set
-to a function.  In this case, @code{recenter-group} calls the function
-with the argument @var{count}, then returns its result.  The argument
+@code{recenter-window-group} scrolls the entire group.  This condition
+holds when the buffer local variable
+@code{recenter-window-group-function} is set to a function.  In this
+case, @code{recenter-window-group} calls the function with the
+argument @var{count}, then returns its result.  The argument
 @var{count} has the same meaning as in @code{recenter}, but with
 respect to the entire window group.
 @end defun
diff --git a/lisp/follow.el b/lisp/follow.el
index dc525315b86..71e8824947d 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -430,7 +430,7 @@ Keys specific to Follow mode:
         (setq window-group-start-function 'follow-window-start)
         (setq window-group-end-function 'follow-window-end)
         (setq set-window-group-start-function 'follow-set-window-start)
-        (setq recenter-group-function 'follow-recenter)
+        (setq recenter-window-group-function 'follow-recenter)
         (setq pos-visible-in-window-group-p-function
               'follow-pos-visible-in-window-p)
         (setq selected-window-group-function 'follow-all-followers)
@@ -450,7 +450,7 @@ Keys specific to Follow mode:
     (kill-local-variable 'move-to-window-group-line-function)
     (kill-local-variable 'selected-window-group-function)
     (kill-local-variable 'pos-visible-in-window-group-p-function)
-    (kill-local-variable 'recenter-group-function)
+    (kill-local-variable 'recenter-window-group-function)
     (kill-local-variable 'set-window-group-start-function)
     (kill-local-variable 'window-group-end-function)
     (kill-local-variable 'window-group-start-function)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index b29e432f37e..05dc2931d93 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2311,15 +2311,15 @@ the bottom."
     (if above
         (progn
           (goto-char start)
-          (recenter-group 0)
+          (recenter-window-group 0)
           (when (>= isearch-point (window-group-end nil t))
             (goto-char isearch-point)
-            (recenter-group -1)))
+            (recenter-window-group -1)))
       (goto-char end)
-      (recenter-group -1)
+      (recenter-window-group -1)
       (when (< isearch-point (window-group-start))
         (goto-char isearch-point)
-        (recenter-group 0))))
+        (recenter-window-group 0))))
   (goto-char isearch-point))
 
 (defvar isearch-pre-scroll-point nil)
diff --git a/lisp/window.el b/lisp/window.el
index ce0256f1fff..c57fef441f5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -7930,10 +7930,10 @@ overriding motion of point in order to display at this exact start."
       (funcall set-window-group-start-function window pos noforce)
     (set-window-start window pos noforce)))
 
-(defvar recenter-group-function nil)
-(make-variable-buffer-local 'recenter-group-function)
-(put 'recenter-group-function 'permanent-local t)
-(defun recenter-group (&optional arg)
+(defvar recenter-window-group-function nil)
+(make-variable-buffer-local 'recenter-window-group-function)
+(put 'recenter-window-group-function 'permanent-local t)
+(defun recenter-window-group (&optional arg)
   "Center point in the group of windows containing the selected window
 and maybe redisplay frame.  When a grouping mode (such as Follow Mode)
 is not active, this function is identical to `recenter'.
@@ -7953,8 +7953,8 @@ are redrawn.
 
 Just C-u as prefix means put point in the center of the window
 and redisplay normally--don't erase and redraw the frame."
-  (if (functionp recenter-group-function)
-      (funcall recenter-group-function arg)
+  (if (functionp recenter-window-group-function)
+      (funcall recenter-window-group-function arg)
     (recenter arg)))
 
 (defvar pos-visible-in-window-group-p-function nil)
-- 
2.39.5