From 4f15fee811d2645bf810a475d4272f83c30608d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 8 Apr 2017 22:11:57 +0200 Subject: vis: remove handling of \r\n line endings Use something like dos2unix(1) and unix2dos(1), if you need to edit such files. --- view.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'view.c') diff --git a/view.c b/view.c index 49b0d4f..7e893ff 100644 --- a/view.c +++ b/view.c @@ -382,11 +382,6 @@ void view_draw(View *view) { cell.width = 1; } - if (cur[0] == '\r' && rem > 1 && cur[1] == '\n') { - /* convert views style newline \r\n into a single char with len = 2 */ - cell = (Cell){ .data = "\n", .len = 2, .width = 1 }; - } - if (cell.width == 0 && prev_cell.len + cell.len < sizeof(cell.data)) { prev_cell.len += cell.len; strcat(prev_cell.data, cell.data); @@ -593,16 +588,12 @@ bool view_viewport_up(View *view, int n) { /* skip newlines immediately before display area */ if (c == '\n' && text_iterator_byte_prev(&it, &c)) off++; - if (c == '\r' && text_iterator_byte_prev(&it, &c)) - off++; do { if (c == '\n' && --n == 0) break; if (++off > max) break; } while (text_iterator_byte_prev(&it, &c)); - if (c == '\r') - off++; view->start -= MIN(view->start, off); view_draw(view); return true; -- cgit v1.2.3