vis
a vi-like editor based on Plan 9's structural regular expressions
git clone https://9o.is/git/vis.git
commit b535793b6253ebe08464febcd9bfba73515c7763 parent 23f6799c645b27c73b8481d34b69febc1b33ae06 Author: Marc André Tanner <mat@brain-dump.org> Date: Mon, 12 Jun 2017 18:27:30 +0200 view: rename view_cursors_number Diffstat:
| M | view.c | | | 2 | +- |
| M | view.h | | | 2 | +- |
| M | vis-lua.c | | | 4 | ++-- |
| M | vis.c | | | 2 | +- |
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/view.c b/view.c @@ -941,7 +941,7 @@ int view_selections_count(View *view) { return view->cursor_count; } -int view_cursors_number(Cursor *c) { +int view_selections_number(Cursor *c) { return c->number; } diff --git a/view.h b/view.h @@ -166,7 +166,7 @@ int view_selections_count(View*); * to remain the same. * @endrst */ -int view_cursors_number(Cursor*); +int view_selections_number(Cursor*); /** Get maximal number of selections on a single line. */ int view_cursors_column_count(View*); /** diff --git a/vis-lua.c b/vis-lua.c @@ -82,7 +82,7 @@ static void window_status_update(Vis *vis, Win *win) { int cursor_count = view_selections_count(view); if (cursor_count > 1) { Cursor *c = view_selections_primary_get(view); - int cursor_number = view_cursors_number(c) + 1; + int cursor_number = view_selections_number(c) + 1; snprintf(right_parts[right_count], sizeof(right_parts[right_count])-1, "%d/%d", cursor_number, cursor_count); right_count++; @@ -1859,7 +1859,7 @@ static int window_cursor_index(lua_State *L) { } if (strcmp(key, "number") == 0) { - lua_pushunsigned(L, view_cursors_number(cur)+1); + lua_pushunsigned(L, view_selections_number(cur)+1); return 1; } diff --git a/vis.c b/vis.c @@ -863,7 +863,7 @@ void vis_do(Vis *vis) { .newpos = EPOS, .range = text_range_empty(), .reg = reg, - .reg_slot = reg_slot == EPOS ? (size_t)view_cursors_number(cursor) : reg_slot, + .reg_slot = reg_slot == EPOS ? (size_t)view_selections_number(cursor) : reg_slot, .linewise = linewise, .arg = &a->arg, .context = a->op ? a->op->context : NULL,