[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0bfb259 11/57: Add vdiff-debug flag
From: |
Justin Burkett |
Subject: |
[elpa] master 0bfb259 11/57: Add vdiff-debug flag |
Date: |
Tue, 3 Nov 2020 14:32:18 -0500 (EST) |
branch: master
commit 0bfb2592f9cd021224ece3e619e70269b6219860
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Add vdiff-debug flag
---
vdiff.el | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 3427dc8..01610f6 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -61,6 +61,7 @@
(defvar vdiff-mode)
(defvar vdiff-3way-mode)
+(defvar vdiff-debug nil)
(defgroup vdiff nil
"Diff tool that is like vimdiff"
@@ -610,7 +611,8 @@ an addition when compared to other vdiff buffers."
(beg-b (cdr lines)))
(while (looking-at-p "+")
(setq lines (vdiff--inc-lines lines)))
- (cl-assert (or (looking-at-p " ") (eobp)))
+ (when vdiff-debug
+ (cl-assert (or (looking-at-p " ") (eobp))))
(push
;; there's no context lines at the beginning of the file
(list (cons (if (= beg-a 1) 1 (1+ beg-a)) nil)
@@ -628,11 +630,13 @@ an addition when compared to other vdiff buffers."
(list (cons beg-a (if (= (car lines) 1) 1 (1- (car
lines))))
(cons (1+ beg-b) nil))
res)
- (cl-assert (or (looking-at-p "+") (eobp)))
+ (when vdiff-debug
+ (cl-assert (or (looking-at-p "+") (eobp))))
(let ((beg-b (cdr lines)))
(while (looking-at-p "+")
(setq lines (vdiff--inc-lines lines)))
- (cl-assert (or (looking-at-p " ") (eobp)))
+ (when vdiff-debug
+ (cl-assert (or (looking-at-p " ") (eobp))))
(push
(list (cons beg-a (1- (car lines)))
(cons beg-b (1- (cdr lines))))
- [elpa] master 52b7e04 04/57: Switch to using unified diff output (diff -u), (continued)
- [elpa] master 52b7e04 04/57: Switch to using unified diff output (diff -u), Justin Burkett, 2020/11/03
- [elpa] master fb21cc6 08/57: Fix parsing of subtractions in diff -u, Justin Burkett, 2020/11/03
- [elpa] master f0de403 21/57: Add emacs-26.1 for Travis, Justin Burkett, 2020/11/03
- [elpa] master af74300 01/57: Add vdiff-disable-folding user option, Justin Burkett, 2020/11/03
- [elpa] master 41c2d0a 02/57: Handle error when no overlay at point, Justin Burkett, 2020/11/03
- [elpa] master c1525a8 05/57: Fix problems with diff -u parser at beg and end of file, Justin Burkett, 2020/11/03
- [elpa] master 0312ac8 06/57: Update copyright years, Justin Burkett, 2020/11/03
- [elpa] master bc5e1a7 07/57: Remove debugging message, Justin Burkett, 2020/11/03
- [elpa] master b15b020 10/57: Add diff --minimal as algorithm and fix case args for git, Justin Burkett, 2020/11/03
- [elpa] master 992d07b 14/57: Add travis support, Justin Burkett, 2020/11/03
- [elpa] master 0bfb259 11/57: Add vdiff-debug flag,
Justin Burkett <=
- [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, 2020/11/03