From 3a24e6a5562e4b1ea456fbe36607bd8a9c92744d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Wed, 24 Sep 2014 16:16:30 +0200
Subject: Change semantics of text_line_end

Also make movement to end of line inclusive. This has the effect
that $ moves to the last character on a line but d$ still deletes
said character.
---
 text-motions.c | 4 ++--
 text-motions.h | 4 ++--
 vis.c          | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/text-motions.c b/text-motions.c
index 69afcc7..b215ffc 100644
--- a/text-motions.c
+++ b/text-motions.c
@@ -119,9 +119,7 @@ size_t text_line_start(Text *txt, size_t pos) {
 size_t text_line_finish(Text *txt, size_t pos) {
 	char c;
 	Iterator it = text_iterator_get(txt, text_line_end(txt, pos));
-	do text_iterator_byte_prev(&it, NULL);
 	while (text_iterator_byte_get(&it, &c) && c != '\n' && isspace(c));
-	if (!ISUTF8(c))
 		text_iterator_char_prev(&it, NULL);
 	return it.pos;
 }
@@ -131,6 +129,8 @@ size_t text_line_end(Text *txt, size_t pos) {
 	Iterator it = text_iterator_get(txt, pos);
 	while (text_iterator_byte_get(&it, &c) && c != '\r' && c != '\n')
 		text_iterator_byte_next(&it, NULL);
+	if (text_iterator_char_prev(&it, &c) && c == '\n')
+		text_iterator_byte_next(&it, NULL);
 	return it.pos;
 }
 
diff --git a/text-motions.h b/text-motions.h
index 18457a5..82450f6 100644
--- a/text-motions.h
+++ b/text-motions.h
@@ -24,8 +24,8 @@ size_t text_find_char_prev(Text*, size_t pos, const char *s, size_t len);
 /*        begin            finish        next
  *        v                v             v
  *  [\r]\n      I am a line!       [\r]\n
- *  ^           ^                  ^
- *  prev        start              end
+ *  ^           ^                 ^
+ *  prev        start             end
  */
 size_t text_line_prev(Text*, size_t pos);
 size_t text_line_begin(Text*, size_t pos);
diff --git a/vis.c b/vis.c
index eefed59..0a9f7dd 100644
--- a/vis.c
+++ b/vis.c
@@ -263,7 +263,7 @@ static Movement moves[] = {
 	[MOVE_LINE_BEGIN]      = { .txt = text_line_begin,      .type = LINEWISE           },
 	[MOVE_LINE_START]      = { .txt = text_line_start,      .type = LINEWISE           },
 	[MOVE_LINE_FINISH]     = { .txt = text_line_finish,     .type = LINEWISE           },
-	[MOVE_LINE_END]        = { .txt = text_line_end,        .type = LINEWISE           },
+	[MOVE_LINE_END]        = { .txt = text_line_end,        .type = LINEWISE|INCLUSIVE },
 	[MOVE_LINE_NEXT]       = { .txt = text_line_next,       .type = LINEWISE           },
 	[MOVE_LINE]            = { .cmd = line,                 .type = LINEWISE|IDEMPOTENT},
 	[MOVE_COLUMN]          = { .cmd = column,               .type = CHARWISE|IDEMPOTENT},
@@ -939,7 +939,7 @@ static void joinline(const Arg *arg) {
 	Text *txt = vis->win->text;
 	size_t pos = window_cursor_get(vis->win->win), start, end;
 	if (arg->i == MOVE_LINE_NEXT) {
-		start = text_line_end(txt, pos);
+		start = text_line_prev(txt, text_line_next(txt, pos));
 		end = text_line_next(txt, pos);
 	} else {
 		end = text_line_begin(txt, pos);
@@ -1000,7 +1000,7 @@ static void action_do(Action *a) {
 				Filerange sel = window_selection_get(win);
 				sel.end = text_char_prev(txt, sel.end);
 				size_t start = text_line_begin(txt, sel.start);
-				size_t end = text_line_end(txt, sel.end);
+				size_t end = text_line_prev(txt, text_line_next(txt, sel.end));
 				if (sel.start == pos) { /* extend selection upwards */
 					sel.end = start;
 					sel.start = end;
-- 
cgit v1.2.3