[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff cc24574 115/258: Fix scroll update for other su
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff cc24574 115/258: Fix scroll update for other subtraction styles |
Date: |
Wed, 17 May 2017 08:13:34 -0400 (EDT) |
branch: scratch/add-vdiff
commit cc2457409063236ed34dddee2ce9bbdc3af355d1
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Fix scroll update for other subtraction styles
---
vdiff.el | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index e0f4d2e..6e39c90 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -974,13 +974,14 @@ buffer)."
(vdiff--move-to-line line)
(line-beginning-position))))
-(defun vdiff--set-vscroll (window vscroll)
+(defun vdiff--set-vscroll-and-force-update (window &optional vscroll)
(run-at-time
nil nil
(lambda ()
(unless vdiff--setting-vscroll
(let ((vdiff--setting-vscroll t))
- (set-window-vscroll window vscroll)
+ (when vscroll
+ (set-window-vscroll window vscroll))
(force-window-update window))))))
(defun vdiff--scroll-function (&optional window window-start)
@@ -1016,8 +1017,10 @@ buffer)."
(set-window-point other-window other-pos)
(unless (= other-curr-start other-start-pos)
(set-window-start other-window other-start-pos))
- (when (eq vdiff-subtraction-style 'full)
- (vdiff--set-vscroll (vdiff--other-window) scroll-amt))))))
+ (vdiff--set-vscroll-and-force-update
+ other-window
+ (when (eq vdiff-subtraction-style 'full)
+ scroll-amt))))))
;; (defun vdiff--post-command-hook ()
;; "Sync scroll for `vdiff--force-sync-commands'."
- [elpa] scratch/add-vdiff cce8eb1 086/258: Don't close fold on point after change, (continued)
- [elpa] scratch/add-vdiff cce8eb1 086/258: Don't close fold on point after change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8a88f84 074/258: Use simpler strategy for updating windows on line move, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c5589a1 089/258: Delete temp files on deactivation, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4dc6c89 077/258: Add next/prev fold commands and update hydra, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4ea6afb 082/258: Add docstrings and rearrange some calls, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 52c675a 096/258: Add hydra screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1276208 103/258: Recenter after next/prev hunk, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4ee7fca 104/258: Set intangible property for closed folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 16eb802 107/258: Update README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0dc9fde 114/258: Try not to move point on change transmission, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cc24574 115/258: Fix scroll update for other subtraction styles,
Justin Burkett <=
- [elpa] scratch/add-vdiff c912ebc 120/258: Don't use window-size-change-hook, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7561f87 100/258: Split line maps, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 32756c3 131/258: A little better than a WIP now, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5a6623f 012/258: Update README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e178a90 017/258: One more fold fix, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e6e87f3 019/258: Add screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d77dd83 032/258: Take care to only remove vdiff overlays on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f915562 047/258: Use customizable function to format closed fold strings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d8a4efb 023/258: Remove unused variable, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 23b3360 030/258: Fix compiler warnings, Justin Burkett, 2017/05/17