vis

commit 10c142826dc5acad78a1e1f1a5b0fe3417fd5bf4
parent 7a0ddf30c207a95945fd9369954a0994758b22e6
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Wed, 24 Sep 2014 13:14:01 +0200

Rename a few functions to avoid conflicts

Diffstat:
M
vis.c
 | 
18
+++++++++---------

1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/vis.c b/vis.c
@@ -244,11 +244,11 @@ static size_t line(const Arg *arg);
 /* goto to byte action.count on current line */
 static size_t column(const Arg *arg);
 /* goto the action.count-th line from top of the focused window */
-static size_t window_line_top(const Arg *arg);
+static size_t window_lines_top(const Arg *arg);
 /* goto the start of middle line of the focused window */
-static size_t window_line_middle(const Arg *arg);
+static size_t window_lines_middle(const Arg *arg);
 /* goto the action.count-th line from bottom of the focused window */
-static size_t window_line_bottom(const Arg *arg);
+static size_t window_lines_bottom(const Arg *arg);
 
 static Movement moves[] = {
 	[MOVE_SCREEN_LINE_UP]  = { .win = window_line_up                                   },
@@ -282,9 +282,9 @@ static Movement moves[] = {
 	[MOVE_MARK_LINE]       = { .cmd = mark_line_goto,       .type = LINEWISE           },
 	[MOVE_SEARCH_FORWARD]  = { .cmd = search_forward,       .type = LINEWISE           },
 	[MOVE_SEARCH_BACKWARD] = { .cmd = search_backward,      .type = LINEWISE           },
-	[MOVE_WINDOW_LINE_TOP]    = { .cmd = window_line_top,   .type = LINEWISE           },
-	[MOVE_WINDOW_LINE_MIDDLE] = { .cmd = window_line_middle,.type = LINEWISE           },
-	[MOVE_WINDOW_LINE_BOTTOM] = { .cmd = window_line_bottom,.type = LINEWISE           },
+	[MOVE_WINDOW_LINE_TOP]    = { .cmd = window_lines_top,   .type = LINEWISE           },
+	[MOVE_WINDOW_LINE_MIDDLE] = { .cmd = window_lines_middle,.type = LINEWISE           },
+	[MOVE_WINDOW_LINE_BOTTOM] = { .cmd = window_lines_bottom,.type = LINEWISE           },
 };
 
 /* these can be passed as int argument to textobj(&(const Arg){ .i = TEXT_OBJ_* }) */
@@ -640,15 +640,15 @@ static size_t column(const Arg *arg) {
 	return it.pos;
 }
 
-static size_t window_line_top(const Arg *arg) {
+static size_t window_lines_top(const Arg *arg) {
 	return window_line_goto(vis->win->win, action.count);
 }
 
-static size_t window_line_middle(const Arg *arg) {
+static size_t window_lines_middle(const Arg *arg) {
 	return window_line_goto(vis->win->win, vis->win->height / 2);
 }
 
-static size_t window_line_bottom(const Arg *arg) {
+static size_t window_lines_bottom(const Arg *arg) {
 	return window_line_goto(vis->win->win, vis->win->height - action.count);
 }