mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

Fix mouse wheel scrolling in Follow mode.

Browse Source 
* lisp/follow.el (follow-mwheel-scroll): New function.
(follow-redraw-after-event): Fix last change.

Fixes: debbugs:4112
This commit is contained in:
Chong Yidong 2012-05-01 22:00:16 +08:00
parent 782fbf2a33
commit 87233a14e0
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/ChangeLog
View File

@ -27,6 +27,7 @@
(follow-scroll-bar-toolkit-scroll, follow-scroll-bar-drag)
(follow-scroll-bar-scroll-up, follow-scroll-bar-scroll-down): New
functions, replacing advice on scroll-bar-* commands.
(follow-mwheel-scroll): New function (Bug#4112).
* comint.el (comint-adjust-point): New function.
(comint-postoutput-scroll-to-bottom): Use it. Call

18
lisp/follow.el
View File

@ -258,6 +258,7 @@ After that, changing the prefix key requires manipulating keymaps."
(define-key mainmap [remap scroll-bar-drag] 'follow-scroll-bar-drag)
(define-key mainmap [remap scroll-bar-scroll-up] 'follow-scroll-bar-scroll-up)
(define-key mainmap [remap scroll-bar-scroll-down] 'follow-scroll-bar-scroll-down)
(define-key mainmap [remap mwheel-scroll] 'follow-mwheel-scroll)
mainmap)
"Minor mode keymap for Follow mode.")
@ -1315,17 +1316,24 @@ non-first windows in Follow mode."
(scroll-bar-scroll-down event)
(follow-redraw-after-event event))
(defun follow-mwheel-scroll (event)
(interactive "e")
(mwheel-scroll event)
(follow-redraw-after-event event))
(defun follow-redraw-after-event (event)
"Re-align the Follow mode windows acted on by EVENT."
(let ((window (nth 0 (event-end event)))
(orig-win (selected-window)))
(when (and (buffer-local-value 'follow-mode (window-buffer window))
"Re-align the Follow mode windows affected by EVENT."
(let* ((window (nth 0 (event-end event)))
(buffer (window-buffer window))
(orig-win (selected-window)))
(when (and (buffer-local-value 'follow-mode buffer)
;; Ignore the case where we scroll the selected window;
;; that is handled by the post-command hook function.
(not (eq window (selected-window))))
(select-window window)
(follow-redisplay)
(select-window orig-win))))
(unless (eq (window-buffer orig-win) buffer)
(select-window orig-win)))))
;;; Window size change