From 0319b359acae515550a3ff68bf62aa2e476015fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Wed, 27 Apr 2016 09:55:21 +0200 Subject: [PATCH] view: change view_cursors_place to take 1 based column number This should fix inconsistency in the Lua API. --- test | 2 +- view.c | 2 +- view.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test b/test index be13b70e9..9d3aa6c2d 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit be13b70e92c4fcdd7b39684e760a5a3a27a8ff4b +Subproject commit 9d3aa6c2d0d33d71d2815e238aeece15542f094b diff --git a/view.c b/view.c index 06f236553..47709ee26 100644 --- a/view.c +++ b/view.c @@ -1336,7 +1336,7 @@ void view_cursors_to(Cursor *c, size_t pos) { void view_cursors_place(Cursor *c, size_t line, size_t col) { Text *txt = c->view->text; size_t pos = text_pos_by_lineno(txt, line); - pos = text_line_char_set(txt, pos, col); + pos = text_line_char_set(txt, pos, col > 0 ? col-1 : col); view_cursors_to(c, pos); } diff --git a/view.h b/view.h index 8460116da..def8bf21d 100644 --- a/view.h +++ b/view.h @@ -161,6 +161,7 @@ int view_cursors_cell_set(Cursor*, int cell); /* place cursor at `pos' which should be in the interval [0, text-size] */ void view_cursors_to(Cursor*, size_t pos); void view_cursors_scroll_to(Cursor*, size_t pos); +/* place cursor on given (line, column) pair, both values are 1-based */ void view_cursors_place(Cursor*, size_t line, size_t col); /* get register associated with this register */ Register *view_cursors_register(Cursor*);