diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/follow.el | 4 | ||||
| -rw-r--r-- | lisp/isearch.el | 8 | ||||
| -rw-r--r-- | lisp/window.el | 12 |
3 files changed, 12 insertions, 12 deletions
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: | |||
| 430 | (setq window-group-start-function 'follow-window-start) | 430 | (setq window-group-start-function 'follow-window-start) |
| 431 | (setq window-group-end-function 'follow-window-end) | 431 | (setq window-group-end-function 'follow-window-end) |
| 432 | (setq set-window-group-start-function 'follow-set-window-start) | 432 | (setq set-window-group-start-function 'follow-set-window-start) |
| 433 | (setq recenter-group-function 'follow-recenter) | 433 | (setq recenter-window-group-function 'follow-recenter) |
| 434 | (setq pos-visible-in-window-group-p-function | 434 | (setq pos-visible-in-window-group-p-function |
| 435 | 'follow-pos-visible-in-window-p) | 435 | 'follow-pos-visible-in-window-p) |
| 436 | (setq selected-window-group-function 'follow-all-followers) | 436 | (setq selected-window-group-function 'follow-all-followers) |
| @@ -450,7 +450,7 @@ Keys specific to Follow mode: | |||
| 450 | (kill-local-variable 'move-to-window-group-line-function) | 450 | (kill-local-variable 'move-to-window-group-line-function) |
| 451 | (kill-local-variable 'selected-window-group-function) | 451 | (kill-local-variable 'selected-window-group-function) |
| 452 | (kill-local-variable 'pos-visible-in-window-group-p-function) | 452 | (kill-local-variable 'pos-visible-in-window-group-p-function) |
| 453 | (kill-local-variable 'recenter-group-function) | 453 | (kill-local-variable 'recenter-window-group-function) |
| 454 | (kill-local-variable 'set-window-group-start-function) | 454 | (kill-local-variable 'set-window-group-start-function) |
| 455 | (kill-local-variable 'window-group-end-function) | 455 | (kill-local-variable 'window-group-end-function) |
| 456 | (kill-local-variable 'window-group-start-function) | 456 | (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." | |||
| 2311 | (if above | 2311 | (if above |
| 2312 | (progn | 2312 | (progn |
| 2313 | (goto-char start) | 2313 | (goto-char start) |
| 2314 | (recenter-group 0) | 2314 | (recenter-window-group 0) |
| 2315 | (when (>= isearch-point (window-group-end nil t)) | 2315 | (when (>= isearch-point (window-group-end nil t)) |
| 2316 | (goto-char isearch-point) | 2316 | (goto-char isearch-point) |
| 2317 | (recenter-group -1))) | 2317 | (recenter-window-group -1))) |
| 2318 | (goto-char end) | 2318 | (goto-char end) |
| 2319 | (recenter-group -1) | 2319 | (recenter-window-group -1) |
| 2320 | (when (< isearch-point (window-group-start)) | 2320 | (when (< isearch-point (window-group-start)) |
| 2321 | (goto-char isearch-point) | 2321 | (goto-char isearch-point) |
| 2322 | (recenter-group 0)))) | 2322 | (recenter-window-group 0)))) |
| 2323 | (goto-char isearch-point)) | 2323 | (goto-char isearch-point)) |
| 2324 | 2324 | ||
| 2325 | (defvar isearch-pre-scroll-point nil) | 2325 | (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." | |||
| 7930 | (funcall set-window-group-start-function window pos noforce) | 7930 | (funcall set-window-group-start-function window pos noforce) |
| 7931 | (set-window-start window pos noforce))) | 7931 | (set-window-start window pos noforce))) |
| 7932 | 7932 | ||
| 7933 | (defvar recenter-group-function nil) | 7933 | (defvar recenter-window-group-function nil) |
| 7934 | (make-variable-buffer-local 'recenter-group-function) | 7934 | (make-variable-buffer-local 'recenter-window-group-function) |
| 7935 | (put 'recenter-group-function 'permanent-local t) | 7935 | (put 'recenter-window-group-function 'permanent-local t) |
| 7936 | (defun recenter-group (&optional arg) | 7936 | (defun recenter-window-group (&optional arg) |
| 7937 | "Center point in the group of windows containing the selected window | 7937 | "Center point in the group of windows containing the selected window |
| 7938 | and maybe redisplay frame. When a grouping mode (such as Follow Mode) | 7938 | and maybe redisplay frame. When a grouping mode (such as Follow Mode) |
| 7939 | is not active, this function is identical to `recenter'. | 7939 | is not active, this function is identical to `recenter'. |
| @@ -7953,8 +7953,8 @@ are redrawn. | |||
| 7953 | 7953 | ||
| 7954 | Just C-u as prefix means put point in the center of the window | 7954 | Just C-u as prefix means put point in the center of the window |
| 7955 | and redisplay normally--don't erase and redraw the frame." | 7955 | and redisplay normally--don't erase and redraw the frame." |
| 7956 | (if (functionp recenter-group-function) | 7956 | (if (functionp recenter-window-group-function) |
| 7957 | (funcall recenter-group-function arg) | 7957 | (funcall recenter-window-group-function arg) |
| 7958 | (recenter arg))) | 7958 | (recenter arg))) |
| 7959 | 7959 | ||
| 7960 | (defvar pos-visible-in-window-group-p-function nil) | 7960 | (defvar pos-visible-in-window-group-p-function nil) |