[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff d8cfb8f 243/258: vdiff: Don't use scroll-lock-m
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff d8cfb8f 243/258: vdiff: Don't use scroll-lock-mode programmatically |
Date: |
Wed, 17 May 2017 08:14:01 -0400 (EDT) |
branch: scratch/add-vdiff
commit d8cfb8fa7cbf5c5e78cbd8fd7bc6d976ce886622
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
vdiff: Don't use scroll-lock-mode programmatically
Use the hook directly so that we control which buffers the hook is activated
in.
---
vdiff.el | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index e88c631..9761aeb 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1835,8 +1835,7 @@ you will be asked to select two files."
(remove-hook 'after-save-hook #'vdiff-refresh t)
(remove-hook 'after-change-functions #'vdiff--after-change-function t)
(remove-hook 'pre-command-hook #'vdiff--flag-new-command t)
- (when vdiff-scroll-lock-mode
- (vdiff-scroll-lock-mode -1)))
+ (remove-hook 'window-scroll-functions #'vdiff--scroll-function t))
(define-minor-mode vdiff-mode
"Minor mode active in a vdiff session involving two
@@ -1848,7 +1847,7 @@ automatically after calling commands like `vdiff-files' or
(cond (vdiff-mode
(vdiff--buffer-init)
(when vdiff-lock-scrolling
- (vdiff-scroll-lock-mode 1)))
+ (add-hook 'window-scroll-functions #'vdiff--scroll-function nil t)))
(t
(vdiff--buffer-cleanup))))
@@ -1862,7 +1861,7 @@ automatically after calling commands like `vdiff-files3'
or
(cond (vdiff-3way-mode
(vdiff--buffer-init)
(when vdiff-lock-scrolling
- (vdiff-scroll-lock-mode 1)))
+ (add-hook 'window-scroll-functions #'vdiff--scroll-function nil t)))
(t
(vdiff--buffer-cleanup))))
- [elpa] scratch/add-vdiff bac92b3 037/258: Improve line translation and command mirroring, (continued)
- [elpa] scratch/add-vdiff bac92b3 037/258: Improve line translation and command mirroring, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 6b6f6e7 044/258: Force fold refresh on window size change, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e005d43 058/258: Delete overlays right away on sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1cf0730 055/258: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 697bb79 060/258: Prefer last element of multiple in line map, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3207365 064/258: Satisfy compiler, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8b6cb54 218/258: vdiff-magit: Port resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 617265b 238/258: vdiff-magit: Remove unused magit-ediff code, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 6f89757 231/258: vdiff-magit: Resurrect resolve, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0f8dd15 239/258: vdiff: Improve a couple of docstrings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d8cfb8f 243/258: vdiff: Don't use scroll-lock-mode programmatically,
Justin Burkett <=
- [elpa] scratch/add-vdiff bc5a9a8 242/258: vdiff-magit: Remove unnecessary local bindings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c32fe46 251/258: vdiff: Fix compiler warnings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 875b0d5 252/258: README: Improve vdiff-magit-popup, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8a3dff3 254/258: vdiff-magit: Add vdiff-magit-stage-is-2way, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3a32c4e 255/258: README: Update, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d4883de 256/258: vdiff-magit: Remove use of camel case names for consistency, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 819ea4b 258/258: Add 'packages/vdiff/' from commit 'f11c7c2eeef33a0b75fe4e025818e7e672c57397', Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 14abb75 078/258: Allow jumping to subtraction overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a15b0e5 084/258: Move point before closing fold, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 425d50b 085/258: Add vdiff-close-other-folds, Justin Burkett, 2017/05/17