From: Alan Mackenzie <acm@muc.de>
Date: Sun, 30 Sep 2018 10:46:26 +0000 (+0000)
Subject: Temporary workaround for bug #32848 for branch emacs-26
X-Git-Tag: emacs-26.1.90~121
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6650751ce73413d05599df07a9c5bc70744260f3;p=emacs.git

Temporary workaround for bug #32848 for branch emacs-26

Do not merge with master.

* lisp/follow.el (follow-mode): Set make-cursor-line-fully-visible to nil
buffer locally whilst follow-mode is active.
---

diff --git a/lisp/follow.el b/lisp/follow.el
index fd397c077bb..7942901bb4f 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -438,7 +438,10 @@ 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))
+        (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))
 
     ;; Remove globally-installed hook functions only if there is no
     ;; other Follow mode buffer.
@@ -451,6 +454,9 @@ 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)