[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff c46b76b 111/258: Set window point on scroll
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff c46b76b 111/258: Set window point on scroll |
Date: |
Wed, 17 May 2017 08:13:33 -0400 (EDT) |
branch: scratch/add-vdiff
commit c46b76b2c13c870bb5adcd260721b3222aad016e
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Set window point on scroll
---
vdiff.el | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 8db5cde..f1fe921 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1003,19 +1003,20 @@ buffer)."
(other-window (if in-b win-a win-b))
(other-buffer (if in-b buf-a buf-b))
(this-start-line (line-number-at-pos window-start))
- (this-line (+ (count-lines window-start (point))
- this-start-line))
- (start-translation (vdiff--translate-line this-start-line in-b))
- (translation (vdiff--translate-line this-line in-b))
+ (start-translation
+ (vdiff--translate-line this-start-line in-b))
(other-curr-start (window-start other-window))
(other-start-line (car start-translation))
(other-start-pos (vdiff--pos-at-line-beginning
other-start-line other-buffer))
(scroll-amt (cdr start-translation))
+ (this-line (+ (count-lines window-start (point))
+ this-start-line))
+ (translation (vdiff--translate-line this-line in-b))
(other-pos (vdiff--pos-at-line-beginning
(car translation) other-buffer))
- (vdiff--in-scroll-hook t)
- other-rel-line)
+ (vdiff--in-scroll-hook t))
+ (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)
- [elpa] scratch/add-vdiff 95a1230 154/258: Fix vscroll bug, (continued)
- [elpa] scratch/add-vdiff 95a1230 154/258: Fix vscroll bug, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e556705 151/258: Simplify scroll function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f36b6b2 162/258: Fix line-translation error, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 13f553f 163/258: Fix fold logic for diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 88e7f1c 178/258: Remove min-window-width, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 679617c 199/258: Force update of window-start on manual scroll-function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff dcf811e 188/258: Add new on-quit options, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c82f2b5 090/258: Add docs on refinements, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3fcf4b9 101/258: Fix sign problem in adding hunk overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9346e46 106/258: Simplify method for setting vscroll, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c46b76b 111/258: Set window point on scroll,
Justin Burkett <=
- [elpa] scratch/add-vdiff fd8c973 109/258: Remove post-command-hook, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 25a7516 128/258: Only run scroll-function once per command, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 25ec344 134/258: Require diff-mode so that diff-mode faces are available, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 371febc 135/258: Add option to automatically refine hunks, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9b3ffb0 150/258: Don't distiguish exit code 0 from 1, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d33845c 167/258: Minor change in cleanup, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff edfae89 176/258: Cleanup vdiff-buffers, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 85a4d4e 087/258: Fix point jumping after sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f041c58 102/258: Sync lines after sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 88ce867 088/258: Initial attempt at refine commands, Justin Burkett, 2017/05/17