[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0efde18 49/57: Improve behavior with respect to region sel
From: |
Justin Burkett |
Subject: |
[elpa] master 0efde18 49/57: Improve behavior with respect to region selection |
Date: |
Tue, 3 Nov 2020 14:32:26 -0500 (EST) |
branch: master
commit 0efde18364dfe68de129d9bdd29614d4db371f8a
Author: Justin Burkett <justin@burkett.cc>
Commit: Justin Burkett <justin@burkett.cc>
Improve behavior with respect to region selection
Prefer use-region-p in vdiff--region-or-close-overlay which adds a check
for the
variable use-empty-active-region.
Make sure transient-mark-mode is enabled for tests. It doesn't seem to be
enabled by default in batch mode.
---
vdiff-test.el | 4 ++++
vdiff.el | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/vdiff-test.el b/vdiff-test.el
index d2833c9..c5ea48c 100644
--- a/vdiff-test.el
+++ b/vdiff-test.el
@@ -32,9 +32,13 @@
(progn
(with-current-buffer buffer-a
(erase-buffer)
+ ;; this seems necessary for batch mode
+ (transient-mark-mode 1)
(insert ,(replace-regexp-in-string "|" "\n" a-string)))
(with-current-buffer buffer-b
(erase-buffer)
+ ;; this seems necessary for batch mode
+ (transient-mark-mode 1)
(insert ,(replace-regexp-in-string "|" "\n" b-string)))
(vdiff-buffers buffer-a buffer-b)
,operation
diff --git a/vdiff.el b/vdiff.el
index a6a3130..32b2092 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1314,7 +1314,7 @@ of a \"word\"."
overlay at point and return it if there is. If this fails check a
line above. Always search to the end of the current line as
well. This only returns bounds for `interactive'."
- (if (region-active-p)
+ (if (use-region-p)
(prog1
(list (region-beginning) (region-end) t)
(deactivate-mark))
- [elpa] master 69eacfe 18/57: Fix and simplify final newline detection, (continued)
- [elpa] master 69eacfe 18/57: Fix and simplify final newline detection, Justin Burkett, 2020/11/03
- [elpa] master 68d6ea3 23/57: Make name of vdiff-test consistent with prefixes, Justin Burkett, 2020/11/03
- [elpa] master e3f5370 37/57: Handle case where full line is not selected in selective send, Justin Burkett, 2020/11/03
- [elpa] master 6c3731a 40/57: Fixup vdiff--transmit-change for 3way diffs, Justin Burkett, 2020/11/03
- [elpa] master ef899b8 46/57: Reset truncate-lines on cleanup, Justin Burkett, 2020/11/03
- [elpa] master c5e0cb0 47/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 5b643c7 24/57: Add another send/receive test, Justin Burkett, 2020/11/03
- [elpa] master 4cc1ee5 35/57: Allow sending selective regions from additions, Justin Burkett, 2020/11/03
- [elpa] master 02309fc 38/57: Retain buffer identities in line maps, Justin Burkett, 2020/11/03
- [elpa] master 71b6f40 43/57: Bound target lines in vdiff--transmit-changes, Justin Burkett, 2020/11/03
- [elpa] master 0efde18 49/57: Improve behavior with respect to region selection,
Justin Burkett <=
- [elpa] master 185e803 57/57: Merge commit '007e44be19d068fd6b49874b6e9b8df8b1f552bd', Justin Burkett, 2020/11/03
- [elpa] master 90f4b24 52/57: Ensure char-before doesn't cause an error, Justin Burkett, 2020/11/03
- [elpa] master a1a82de 50/57: Merge pull request #25 from justbur/send-region, Justin Burkett, 2020/11/03
- [elpa] master 08437d5 48/57: Update gitignore, Justin Burkett, 2020/11/03
- [elpa] master 09e15fc 51/57: Announce selective sending of changes using the region in README, Justin Burkett, 2020/11/03
- [elpa] master 45923bb 41/57: Fix compiler warnings, Justin Burkett, 2020/11/03
- [elpa] master 745cc02 42/57: Add test for selective send, Justin Burkett, 2020/11/03
- [elpa] master fe10fb3 44/57: Cleanup some of the transmit addition/changes logic, Justin Burkett, 2020/11/03
- [elpa] master 835485b 13/57: Announce vdiff-diff-algorithm in README, Justin Burkett, 2020/11/03
- [elpa] master c0541ae 55/57: Update readme badges, Justin Burkett, 2020/11/03