From 3c6a6c4c342e2b5cca62cda849acc6d476dafa30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 3 May 2017 17:51:52 +0200 Subject: text: remove text_insert_newline function This is no longer needed because we always insert \n never \r\n. --- text.c | 4 ---- text.h | 2 -- vis-lua.c | 4 ++-- vis-operators.c | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/text.c b/text.c index 7fdd237..8de43a2 100644 --- a/text.c +++ b/text.c @@ -670,10 +670,6 @@ bool text_printf(Text *txt, size_t pos, const char *format, ...) { return ret; } -size_t text_insert_newline(Text *txt, size_t pos) { - return text_insert(txt, pos, "\n", 1) ? 1 : 0; -} - static size_t revision_undo(Text *txt, Revision *rev) { size_t pos = EPOS; for (Change *c = rev->change; c; c = c->next) { diff --git a/text.h b/text.h index 3080acb..abeaef4 100644 --- a/text.h +++ b/text.h @@ -357,8 +357,6 @@ ssize_t text_write_range(Text*, Filerange*, int fd); bool text_mmaped(Text*, const char *ptr); /** @} */ -size_t text_insert_newline(Text*, size_t pos); - #define text_iterate(txt, it, pos) \ for (Iterator it = text_iterator_get((txt), (pos)); \ text_iterator_valid(&it); \ diff --git a/vis-lua.c b/vis-lua.c index ed7ac38..58403d4 100644 --- a/vis-lua.c +++ b/vis-lua.c @@ -2129,7 +2129,7 @@ static int file_lines_newindex(lua_State *L) { const char *data = luaL_checklstring(L, 3, &size); if (line == 0) { text_insert(txt, 0, data, size); - text_insert_newline(txt, size); + text_insert(txt, size, "\n", 1); return 0; } size_t start = text_pos_by_lineno(txt, line); @@ -2138,7 +2138,7 @@ static int file_lines_newindex(lua_State *L) { text_delete(txt, start, end - start); text_insert(txt, start, data, size); if (text_size(txt) == start + size) - text_insert_newline(txt, text_size(txt)); + text_insert(txt, text_size(txt), "\n", 1); } return 0; } diff --git a/vis-operators.c b/vis-operators.c index 38ac7c8..bce91ad 100644 --- a/vis-operators.c +++ b/vis-operators.c @@ -64,11 +64,11 @@ static size_t op_put(Vis *vis, Text *txt, OperatorContext *c) { for (int i = 0; i < c->count; i++) { char nl; if (c->reg->linewise && pos > 0 && text_byte_get(txt, pos-1, &nl) && nl != '\n') - pos += text_insert_newline(txt, pos); + pos += text_insert(txt, pos, "\n", 1); text_insert(txt, pos, data, len); pos += len; if (c->reg->linewise && pos > 0 && text_byte_get(txt, pos-1, &nl) && nl != '\n') - pos += text_insert_newline(txt, pos); + pos += text_insert(txt, pos, "\n", 1); } if (c->reg->linewise) { -- cgit v1.2.3