[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c732247 45/57: Reset truncate-lines on cleanup
From: |
Justin Burkett |
Subject: |
[elpa] master c732247 45/57: Reset truncate-lines on cleanup |
Date: |
Tue, 3 Nov 2020 14:32:25 -0500 (EST) |
branch: master
commit c732247f19c56caa32e679633a0d7ae158aab56c
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Reset truncate-lines on cleanup
See #21
---
vdiff.el | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 2c6085d..a6a3130 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -231,6 +231,7 @@ because those are handled differently.")
(defvar vdiff--inhibit-window-switch nil)
(defvar vdiff--inhibit-diff-update nil)
(defvar vdiff--in-scroll-hook nil)
+(defvar vdiff--cleanup-hook nil)
;; (defvar vdiff--in-post-command-hook nil)
(defvar vdiff--setting-vscroll nil)
(defvar vdiff--after-change-timer nil)
@@ -2281,8 +2282,10 @@ See README for entry points into a vdiff session."))
(current-window-configuration))
(when vdiff-lock-scrolling
(add-hook 'window-scroll-functions #'vdiff--scroll-function nil t))
- (when vdiff-truncate-lines
+ (when (and vdiff-truncate-lines (null truncate-lines))
(let (message-log-max)
+ (add-hook 'vdiff--cleanup-hook
+ (lambda () (toggle-truncate-lines 0)) nil t)
(toggle-truncate-lines 1)))))
(defun vdiff--buffer-cleanup ()
@@ -2292,7 +2295,8 @@ See README for entry points into a vdiff session."))
(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))
- (remove-hook 'window-scroll-functions #'vdiff--scroll-function t))
+ (remove-hook 'window-scroll-functions #'vdiff--scroll-function t)
+ (run-hooks 'vdiff--cleanup-hook))
(define-minor-mode vdiff-mode
"Minor mode active in a vdiff session involving two
- [elpa] master 0bfb259 11/57: Add vdiff-debug flag, (continued)
- [elpa] master 0bfb259 11/57: Add vdiff-debug flag, Justin Burkett, 2020/11/03
- [elpa] master 106a69f 20/57: Fix previous tests for Travis, Justin Burkett, 2020/11/03
- [elpa] master c803bd6 17/57: Add warnings for obsolete variables, Justin Burkett, 2020/11/03
- [elpa] master 5f7d3fd 22/57: Add Travis badge, Justin Burkett, 2020/11/03
- [elpa] master 348d1a7 27/57: Add after-quit arg to vdiff-test-with-buffers, Justin Burkett, 2020/11/03
- [elpa] master fd6ec8e 25/57: Test that both buffers are correct by default, Justin Burkett, 2020/11/03
- [elpa] master 45666cc 30/57: README: evil-collection adds vimdiff-like bindings, Justin Burkett, 2020/11/03
- [elpa] master 6878093 33/57: Add vdiff-toggle-fold and vdiff-toggle-all-folds, Justin Burkett, 2020/11/03
- [elpa] master ccc773b 39/57: Add optional to-buffer arg to vdiff--translate line, Justin Burkett, 2020/11/03
- [elpa] master 58d530b 53/57: Add vdiff-temp-files, Justin Burkett, 2020/11/03
- [elpa] master c732247 45/57: Reset truncate-lines on cleanup,
Justin Burkett <=
- [elpa] master 61d29bb 54/57: Travis -> github workflow, Justin Burkett, 2020/11/03
- [elpa] master eb553fa 09/57: Add support for different diff algorithms, Justin Burkett, 2020/11/03
- [elpa] master 8f3fa10 15/57: Fix Makefile typo, Justin Burkett, 2020/11/03
- [elpa] master 5667bc6 16/57: Ensure input files to diff end in newline, Justin Burkett, 2020/11/03
- [elpa] master 110d672 12/57: Cleanup diff parsing function, Justin Burkett, 2020/11/03
- [elpa] master bd8976e 26/57: Add movement and setup tests, Justin Burkett, 2020/11/03
- [elpa] master 40ffc92 29/57: Warn on bad initialization of vdiff session., Justin Burkett, 2020/11/03
- [elpa] master 0e10521 31/57: Merge pull request #20 from edkolev/patch-1, Justin Burkett, 2020/11/03
- [elpa] master f2a622f 34/57: Improve vdiff-toggle-fold, Justin Burkett, 2020/11/03
- [elpa] master 45f7019 19/57: Add basic send and receive tests, Justin Burkett, 2020/11/03