aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/follow.el8
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/follow.el b/lisp/follow.el
index 7942901bb4f..fd397c077bb 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -438,10 +438,7 @@ Keys specific to Follow mode:
438 (setq pos-visible-in-window-group-p-function 438 (setq pos-visible-in-window-group-p-function
439 'follow-pos-visible-in-window-p) 439 'follow-pos-visible-in-window-p)
440 (setq selected-window-group-function 'follow-all-followers) 440 (setq selected-window-group-function 'follow-all-followers)
441 (setq move-to-window-group-line-function 'follow-move-to-window-line) 441 (setq move-to-window-group-line-function 'follow-move-to-window-line))
442
443 ;; Crude workaround for bug #32848 for the emacs-26 branch, 2018-09-30.
444 (setq-local make-cursor-line-fully-visible nil))
445 442
446 ;; Remove globally-installed hook functions only if there is no 443 ;; Remove globally-installed hook functions only if there is no
447 ;; other Follow mode buffer. 444 ;; other Follow mode buffer.
@@ -454,9 +451,6 @@ Keys specific to Follow mode:
454 (remove-hook 'post-command-hook 'follow-post-command-hook) 451 (remove-hook 'post-command-hook 'follow-post-command-hook)
455 (remove-hook 'window-size-change-functions 'follow-window-size-change))) 452 (remove-hook 'window-size-change-functions 'follow-window-size-change)))
456 453
457 ;; Second part of crude workaround for bug #32848.
458 (kill-local-variable 'make-cursor-line-fully-visible)
459
460 (kill-local-variable 'move-to-window-group-line-function) 454 (kill-local-variable 'move-to-window-group-line-function)
461 (kill-local-variable 'selected-window-group-function) 455 (kill-local-variable 'selected-window-group-function)
462 (kill-local-variable 'pos-visible-in-window-group-p-function) 456 (kill-local-variable 'pos-visible-in-window-group-p-function)