diff options
| author | Alan Mackenzie <acm@muc.de> | 2018-10-03 12:08:59 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2018-10-03 15:20:34 +0000 |
| commit | ea77c6594e5ccc9057ca664ef1dea766ca291b8e (patch) | |
| tree | 507b2c98ef63ced45b6d71cda6e1eb074bd4abb1 /lisp/follow.el | |
| parent | 2c8ea4654dc72ccb93ef63632a888ea3d395f599 (diff) | |
| download | emacs-ea77c6594e5ccc9057ca664ef1dea766ca291b8e.tar.gz emacs-ea77c6594e5ccc9057ca664ef1dea766ca291b8e.tar.bz2 emacs-ea77c6594e5ccc9057ca664ef1dea766ca291b8e.zip | |
Revert "Temporary workaround for bug #32848 for branch emacs-26"
This reverts commit 6650751ce73413d05599df07a9c5bc70744260f3.
Diffstat (limited to 'lisp/follow.el')
| -rw-r--r-- | lisp/follow.el | 8 |
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: (setq pos-visible-in-window-group-p-function 'follow-pos-visible-in-window-p) (setq selected-window-group-function 'follow-all-followers) - (setq move-to-window-group-line-function 'follow-move-to-window-line) - - ;; Crude workaround for bug #32848 for the emacs-26 branch, 2018-09-30. - (setq-local make-cursor-line-fully-visible nil)) + (setq move-to-window-group-line-function 'follow-move-to-window-line)) ;; Remove globally-installed hook functions only if there is no ;; other Follow mode buffer. @@ -454,9 +451,6 @@ Keys specific to Follow mode: (remove-hook 'post-command-hook 'follow-post-command-hook) (remove-hook 'window-size-change-functions 'follow-window-size-change))) - ;; Second part of crude workaround for bug #32848. - (kill-local-variable 'make-cursor-line-fully-visible) - (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) |