[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff eda4b1b 204/258: Force update of window-start i
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff eda4b1b 204/258: Force update of window-start in manual calls to scroll func |
Date: |
Wed, 17 May 2017 08:13:51 -0400 (EDT) |
branch: scratch/add-vdiff
commit eda4b1bee033d3fde19a70ccfd2abbe278230f0e
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Force update of window-start in manual calls to scroll func
---
vdiff.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/vdiff.el b/vdiff.el
index 58ca0b9..3a56fec 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1375,6 +1375,7 @@ buffer)."
(defun vdiff--scroll-function (&optional window window-start)
"Sync scrolling of all vdiff windows."
(let* ((window (or window (selected-window)))
+ (update-window-start (null window-start))
(window-start (or window-start (progn
;; redisplay updates window-start in
;; the case where the scroll function
@@ -1398,7 +1399,11 @@ buffer)."
(when (and 2-pos 2-start-pos)
(set-window-point 2-win 2-pos)
;; For some reason without this unless the vscroll gets eff'd
- (unless (= (window-start 2-win) 2-start-pos)
+ (unless (= (progn
+ (when update-window-start
+ (redisplay))
+ (window-start 2-win))
+ 2-start-pos)
(set-window-start 2-win 2-start-pos))
(vdiff--set-vscroll-and-force-update 2-win 2-scroll))
(when vdiff-3way-mode
- [elpa] scratch/add-vdiff f3b6cec 179/258: Center on start, (continued)
- [elpa] scratch/add-vdiff f3b6cec 179/258: Center on start, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 667a7e4 144/258: Generalize data structures to prepare for diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 059d288 208/258: Update gitignore, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff cfad650 207/258: Provide missing function for emacs-nox users, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e567468 221/258: vdiff-magit: Port show-working-tree, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 30b0f9c 213/258: Add vdiff-magit.el with two functions, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 64430c3 215/258: Cleanup merge, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 19f4616 217/258: vdiff-magit: Port compare and show-commit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a81d62a 240/258: README: Update recent changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9be4fe3 066/258: Update install instructions in README, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff eda4b1b 204/258: Force update of window-start in manual calls to scroll func,
Justin Burkett <=
- [elpa] scratch/add-vdiff 7d60015 201/258: Add some doctrings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3037be6 222/258: vdiff-magit: Cleanup references in dwim, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 615e7bd 228/258: vdiff-magit: Fix killing of buffers in stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a040a4b 246/258: vdiff: Add vdiff-merge-conflict, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7fbb20e 205/258: Nil temp-session after using it, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 048d544 198/258: Pass session explicitly from refresh sentinel, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ed25084 224/258: vdiff-magit: Fix some strings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 432534d 230/258: vdiff-magit: Don't use vdiff-magit-resolve yet, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1d79425 235/258: vdiff-magit: Cleanup header, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c2c991d 209/258: Add initial vdiff-magit work, Justin Burkett, 2017/05/17