From 113a6a6a84198432ed9258f4abd5ec490a64c518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Wed, 28 Feb 2018 19:45:26 +0100
Subject: vis: improve handling of linewise ranges in change operator

---
 text-objects.c  | 2 +-
 vis-operators.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/text-objects.c b/text-objects.c
index 1f44222..fcd0158 100644
--- a/text-objects.c
+++ b/text-objects.c
@@ -375,7 +375,7 @@ Filerange text_range_linewise(Text *txt, Filerange *rin) {
 }
 
 bool text_range_is_linewise(Text *txt, Filerange *r) {
-	return text_range_valid(r) &&
+	return text_range_size(r) > 0 &&
 	       r->start == text_line_begin(txt, r->start) &&
 	       r->end == text_line_begin(txt, r->end);
 }
diff --git a/vis-operators.c b/vis-operators.c
index 299bc56..0e8ff30 100644
--- a/vis-operators.c
+++ b/vis-operators.c
@@ -17,10 +17,14 @@ static size_t op_delete(Vis *vis, Text *txt, OperatorContext *c) {
 }
 
 static size_t op_change(Vis *vis, Text *txt, OperatorContext *c) {
+	bool linewise = c->linewise || text_range_is_linewise(txt, &c->range);
 	op_delete(vis, txt, c);
 	size_t pos = c->range.start;
-	if (c->linewise)
-		pos = vis_text_insert_nl(vis, txt, pos > 0 ? pos-1 : pos);
+	if (linewise) {
+		size_t newpos = vis_text_insert_nl(vis, txt, pos > 0 ? pos-1 : pos);
+		if (pos > 0)
+			pos = newpos;
+	}
 	return pos;
 }
 
-- 
cgit v1.2.3