commit df2a4679d50801617069a3033232b03f52d9f661 parent 380ad30a53b25644f96b3fad07ee7285537b132e Author: David Lawrence Ramsey <pooka109@gmail.com> Date: Tue, 31 Jan 2017 16:37:10 -0600 softwrap: account for softwrap in get_page_start() In softwrap mode, nano doesn't horizontally scroll lines at all, so in this case get_page_start() should always return zero. Diffstat:
| M | src/utils.c | | | 7 | ++++--- |
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/utils.c b/src/utils.c @@ -367,13 +367,14 @@ char *free_and_assign(char *dest, char *src) return src; } -/* nano scrolls horizontally within a line in chunks. Return the column - * number of the first character displayed in the edit window when the +/* When not in softwrap mode, nano scrolls horizontally within a line in + * chunks (a bit smaller than the chunks used in softwrapping). Return the + * column number of the first character displayed in the edit window when the * cursor is at the given column. Note that (0 <= column - * get_page_start(column) < COLS). */ size_t get_page_start(size_t column) { - if (column == 0 || column < editwincols - 1) + if (column < editwincols - 1 || ISSET(SOFTWRAP) || column == 0) return 0; else if (editwincols > 8) return column - 7 - (column - 7) % (editwincols - 8);