aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.c6
-rw-r--r--sam.c4
-rw-r--r--view.c6
-rw-r--r--view.h4
-rw-r--r--vis-operators.c2
5 files changed, 11 insertions, 11 deletions
diff --git a/main.c b/main.c
index 22f650e..b69e321 100644
--- a/main.c
+++ b/main.c
@@ -1267,7 +1267,7 @@ static const char *cursors_new(Vis *vis, const char *keys, const Arg *arg) {
view_line_up(cursor);
size_t newpos = view_cursors_pos(cursor);
view_cursors_to(cursor, oldpos);
- Cursor *cursor_new = view_cursors_new(view, newpos);
+ Cursor *cursor_new = view_selections_new(view, newpos);
if (!cursor_new) {
if (arg->i == -1)
cursor_new = view_cursors_prev(cursor);
@@ -1378,7 +1378,7 @@ static const char *cursors_select_next(Vis *vis, const char *keys, const Arg *ar
Filerange word = text_object_word_find_next(txt, sel.end, buf);
if (text_range_valid(&word)) {
size_t pos = text_char_prev(txt, word.end);
- if ((cursor = view_cursors_new(view, pos))) {
+ if ((cursor = view_selections_new(view, pos))) {
view_cursors_selection_set(cursor, &word);
view_cursors_primary_set(cursor);
goto out;
@@ -1390,7 +1390,7 @@ static const char *cursors_select_next(Vis *vis, const char *keys, const Arg *ar
if (!text_range_valid(&word))
goto out;
size_t pos = text_char_prev(txt, word.end);
- if ((cursor = view_cursors_new(view, pos))) {
+ if ((cursor = view_selections_new(view, pos))) {
view_cursors_selection_set(cursor, &word);
view_cursors_primary_set(cursor);
}
diff --git a/sam.c b/sam.c
index 1695b91..f928de3 100644
--- a/sam.c
+++ b/sam.c
@@ -1221,7 +1221,7 @@ enum SamError sam_cmd(Vis *vis, const char *s) {
view_cursors_to(c->cursor, sel.end);
}
} else if (visual) {
- Cursor *cursor = view_cursors_new(c->win->view, sel.start);
+ Cursor *cursor = view_selections_new(c->win->view, sel.start);
if (cursor) {
view_cursors_selection_set(cursor, &sel);
view_cursors_selection_start(cursor);
@@ -1501,7 +1501,7 @@ static bool cmd_print(Vis *vis, Win *win, Command *cmd, const char *argv[], Curs
if (cur)
view_cursors_to(cur, pos);
else
- cur = view_cursors_new_force(view, pos);
+ cur = view_selections_new_force(view, pos);
if (cur) {
if (range->start != range->end) {
view_cursors_selection_set(cur, range);
diff --git a/view.c b/view.c
index b69ba57..3a11737 100644
--- a/view.c
+++ b/view.c
@@ -503,7 +503,7 @@ View *view_new(Text *text) {
View *view = calloc(1, sizeof(View));
if (!view)
return NULL;
- if (!view_cursors_new(view, 0)) {
+ if (!view_selections_new(view, 0)) {
view_free(view);
return NULL;
}
@@ -929,11 +929,11 @@ err:
return NULL;
}
-Cursor *view_cursors_new(View *view, size_t pos) {
+Cursor *view_selections_new(View *view, size_t pos) {
return cursors_new(view, pos, false);
}
-Cursor *view_cursors_new_force(View *view, size_t pos) {
+Cursor *view_selections_new_force(View *view, size_t pos) {
return cursors_new(view, pos, true);
}
diff --git a/view.h b/view.h
index fa40a58..e5e40dc 100644
--- a/view.h
+++ b/view.h
@@ -104,7 +104,7 @@ bool view_update(View*);
* .. warning:: Fails if position is already covered by a selection.
* @endrst
*/
-Cursor *view_cursors_new(View*, size_t pos);
+Cursor *view_selections_new(View*, size_t pos);
/**
* Create a new selection even if position is already covered by an
* existing selection.
@@ -113,7 +113,7 @@ Cursor *view_cursors_new(View*, size_t pos);
* disposed.
* @endrst
*/
-Cursor *view_cursors_new_force(View*, size_t pos);
+Cursor *view_selections_new_force(View*, size_t pos);
/**
* Dispose an existing selection.
* @rst
diff --git a/vis-operators.c b/vis-operators.c
index bce91ad..38dfbae 100644
--- a/vis-operators.c
+++ b/vis-operators.c
@@ -190,7 +190,7 @@ static size_t op_cursor(Vis *vis, Text *txt, OperatorContext *c) {
pos = text_line_finish(txt, line);
else
pos = text_line_start(txt, line);
- view_cursors_new_force(view, pos);
+ view_selections_new_force(view, pos);
}
return EPOS;
}