[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff b267885 137/258: Merge branch 'gvol-master'
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff b267885 137/258: Merge branch 'gvol-master' |
Date: |
Wed, 17 May 2017 08:13:38 -0400 (EDT) |
branch: scratch/add-vdiff
commit b26788557497c9fc428aaa1a3390d64a380a26f2
Merge: c6e30a2 371febc
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Merge branch 'gvol-master'
---
vdiff.el | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/vdiff.el b/vdiff.el
index dd96296..11e8db2 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -104,6 +104,11 @@
https://www.gnu.org/software/emacs/manual/html_node/elisp/Syntax-Class-Table.htm
:group 'vdiff
:type 'string)
+(defcustom vdiff-auto-refine t
+ "If non-nil, automatically refine all hunks."
+ :group 'vdiff
+ :type 'bool)
+
(defcustom vdiff-subtraction-style 'full
"How to represent subtractions (i.e., deleted lines). The
default is full which means add the same number of (fake) lines
@@ -390,7 +395,9 @@ parsing the diff output and triggering the overlay updates."
(vdiff--refresh-overlays)
(vdiff--refresh-line-maps)
(delete-file (process-get proc 'vdiff-tmp-a))
- (delete-file (process-get proc 'vdiff-tmp-b))))
+ (delete-file (process-get proc 'vdiff-tmp-b))
+ (when vdiff-auto-refine
+ (vdiff-refine-all-hunks))))
(setq vdiff--diff-stale nil)))
(defun vdiff--remove-all-overlays ()
- [elpa] scratch/add-vdiff 4596948 081/258: Reduce load in vdiff--scroll-function, (continued)
- [elpa] scratch/add-vdiff 4596948 081/258: Reduce load in vdiff--scroll-function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d65fcd7 083/258: Simplify commentary, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0777eda 099/258: Add vdiff-refresh binding to prefix map, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d46f686 094/258: Make README table narrower, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 803fd6d 098/258: Add subtraction style option, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5f2c72c 105/258: Change alignment algorithm, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f481a82 112/258: Add refresh timer delay, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 28d28b7 116/258: Add restore windows command, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 905be9c 122/258: Map remove refinements command, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 717d5b6 121/258: Allow failed line translation, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b267885 137/258: Merge branch 'gvol-master',
Justin Burkett <=
- [elpa] scratch/add-vdiff 8daa391 133/258: Add case and whitespace toggles, Justin Burkett, 2017/05/17
- [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