aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mackenzie2018-09-30 10:46:26 +0000
committerAlan Mackenzie2018-09-30 10:46:26 +0000
commit6650751ce73413d05599df07a9c5bc70744260f3 (patch)
tree5fb38a8e5ffc0ab90ac16405939f458884a6a7cf
parent7296b6fbf27aeae76ea63ab2d9d9f2e46491b971 (diff)
downloademacs-6650751ce73413d05599df07a9c5bc70744260f3.tar.gz
emacs-6650751ce73413d05599df07a9c5bc70744260f3.zip
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.
-rw-r--r--lisp/follow.el8
1 files changed, 7 insertions, 1 deletions
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:
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))
442 445
443 ;; Remove globally-installed hook functions only if there is no 446 ;; Remove globally-installed hook functions only if there is no
444 ;; other Follow mode buffer. 447 ;; other Follow mode buffer.
@@ -451,6 +454,9 @@ Keys specific to Follow mode:
451 (remove-hook 'post-command-hook 'follow-post-command-hook) 454 (remove-hook 'post-command-hook 'follow-post-command-hook)
452 (remove-hook 'window-size-change-functions 'follow-window-size-change))) 455 (remove-hook 'window-size-change-functions 'follow-window-size-change)))
453 456
457 ;; Second part of crude workaround for bug #32848.
458 (kill-local-variable 'make-cursor-line-fully-visible)
459
454 (kill-local-variable 'move-to-window-group-line-function) 460 (kill-local-variable 'move-to-window-group-line-function)
455 (kill-local-variable 'selected-window-group-function) 461 (kill-local-variable 'selected-window-group-function)
456 (kill-local-variable 'pos-visible-in-window-group-p-function) 462 (kill-local-variable 'pos-visible-in-window-group-p-function)