branch: master
commit 0efde18364dfe68de129d9bdd29614d4db371f8a
Author: Justin Burkett <jus...@burkett.cc>
Commit: Justin Burkett <jus...@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))
