commit 304548ef826db3e9f3556a85a76d8ea7c58454f7
parent dd6f129c3c3c100f3ac8ef1e9ff0e65942ad2a8f
Author: Benno Schulenberg <bensberg@telfort.nl>
Date: Wed, 11 Mar 2020 19:45:06 +0100
tweaks: rename two functions, to match the style of others
Diffstat:
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/browser.c b/src/browser.c
@@ -195,10 +195,10 @@ char *do_browser(char *path)
} else if (func == do_down) {
if (selected + width <= filelist_len - 1)
selected += width;
- } else if (func == do_prev_block) {
+ } else if (func == to_prev_block) {
selected = ((selected / (editwinrows * width)) *
editwinrows * width) + selected % width;
- } else if (func == do_next_block) {
+ } else if (func == to_next_block) {
selected = ((selected / (editwinrows * width)) *
editwinrows * width) + selected % width +
editwinrows * width - width;
diff --git a/src/global.c b/src/global.c
@@ -925,9 +925,9 @@ void shortcut_init(void)
N_("Scroll Down"), WITHORSANS(scrolldown_gist), BLANKAFTER, VIEW);
#endif
- add_to_funcs(do_prev_block, MMAIN,
+ add_to_funcs(to_prev_block, MMAIN,
N_("Prev Block"), WITHORSANS(prevblock_gist), TOGETHER, VIEW);
- add_to_funcs(do_next_block, MMAIN,
+ add_to_funcs(to_next_block, MMAIN,
N_("Next Block"), WITHORSANS(nextblock_gist), TOGETHER, VIEW);
#ifdef ENABLE_JUSTIFY
add_to_funcs(do_para_begin_void, MMAIN|MGOTOLINE,
@@ -1109,9 +1109,9 @@ void shortcut_init(void)
N_("Left Column"), WITHORSANS(browserlefthand_gist), TOGETHER, VIEW);
add_to_funcs(to_next_word, MBROWSER,
N_("Right Column"), WITHORSANS(browserrighthand_gist), TOGETHER, VIEW);
- add_to_funcs(do_prev_block, MBROWSER,
+ add_to_funcs(to_prev_block, MBROWSER,
N_("Top Row"), WITHORSANS(browsertoprow_gist), TOGETHER, VIEW);
- add_to_funcs(do_next_block, MBROWSER,
+ add_to_funcs(to_next_block, MBROWSER,
N_("Bottom Row"), WITHORSANS(browserbottomrow_gist), BLANKAFTER, VIEW);
#endif
#endif /* ENABLE_BROWSER */
@@ -1250,18 +1250,18 @@ void shortcut_init(void)
if (using_utf8()) {
add_to_sclist(MMAIN|MBROWSER|MHELP, "\xE2\x96\xb2", KEY_UP, do_up, 0);
add_to_sclist(MMAIN|MBROWSER|MHELP, "\xE2\x96\xbc", KEY_DOWN, do_down, 0);
- add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xb2", CONTROL_UP, do_prev_block, 0);
- add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xbc", CONTROL_DOWN, do_next_block, 0);
+ add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xb2", CONTROL_UP, to_prev_block, 0);
+ add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xbc", CONTROL_DOWN, to_next_block, 0);
} else
#endif
{
add_to_sclist(MMAIN|MBROWSER|MHELP, "Up", KEY_UP, do_up, 0);
add_to_sclist(MMAIN|MBROWSER|MHELP, "Down", KEY_DOWN, do_down, 0);
- add_to_sclist(MMAIN|MBROWSER|MLINTER, "^Up", CONTROL_UP, do_prev_block, 0);
- add_to_sclist(MMAIN|MBROWSER|MLINTER, "^Down", CONTROL_DOWN, do_next_block, 0);
+ add_to_sclist(MMAIN|MBROWSER|MLINTER, "^Up", CONTROL_UP, to_prev_block, 0);
+ add_to_sclist(MMAIN|MBROWSER|MLINTER, "^Down", CONTROL_DOWN, to_next_block, 0);
}
- add_to_sclist(MMAIN, "M-7", 0, do_prev_block, 0);
- add_to_sclist(MMAIN, "M-8", 0, do_next_block, 0);
+ add_to_sclist(MMAIN, "M-7", 0, to_prev_block, 0);
+ add_to_sclist(MMAIN, "M-8", 0, to_next_block, 0);
#ifdef ENABLE_JUSTIFY
add_to_sclist(MMAIN, "M-(", 0, do_para_begin_void, 0);
add_to_sclist(MMAIN, "M-9", 0, do_para_begin_void, 0);
diff --git a/src/move.c b/src/move.c
@@ -222,7 +222,7 @@ void do_para_end_void(void)
#endif /* ENABLE_JUSTIFY */
/* Move to the preceding block of text. */
-void do_prev_block(void)
+void to_prev_block(void)
{
linestruct *was_current = openfile->current;
bool is_text = FALSE, seen_text = FALSE;
@@ -244,7 +244,7 @@ void do_prev_block(void)
}
/* Move to the next block of text. */
-void do_next_block(void)
+void to_next_block(void)
{
linestruct *was_current = openfile->current;
bool is_white = white_string(openfile->current->data);
diff --git a/src/nano.c b/src/nano.c
@@ -1438,7 +1438,7 @@ bool wanted_to_move(void (*func)(void))
#ifdef ENABLE_JUSTIFY
func == do_para_begin_void || func == do_para_end_void ||
#endif
- func == do_prev_block || func == do_next_block ||
+ func == to_prev_block || func == to_next_block ||
func == do_page_up || func == do_page_down ||
func == to_first_line || func == to_last_line;
}
diff --git a/src/proto.h b/src/proto.h
@@ -370,8 +370,8 @@ void do_para_end(linestruct **line);
void do_para_begin_void(void);
void do_para_end_void(void);
#endif
-void do_prev_block(void);
-void do_next_block(void);
+void to_prev_block(void);
+void to_next_block(void);
void do_prev_word(bool allow_punct);
bool do_next_word(bool after_ends, bool allow_punct);
void to_prev_word(void);
diff --git a/src/rcfile.c b/src/rcfile.c
@@ -348,9 +348,9 @@ keystruct *strtosc(const char *input)
else if (!strcmp(input, "end"))
s->func = do_end;
else if (!strcmp(input, "prevblock"))
- s->func = do_prev_block;
+ s->func = to_prev_block;
else if (!strcmp(input, "nextblock"))
- s->func = do_next_block;
+ s->func = to_next_block;
else if (!strcmp(input, "pageup") ||
!strcmp(input, "prevpage"))
s->func = do_page_up;
diff --git a/src/text.c b/src/text.c
@@ -2820,7 +2820,7 @@ void do_linter(void)
} else if (func == do_help) {
tmplint = NULL;
do_help();
- } else if (func == do_page_up || func == do_prev_block) {
+ } else if (func == do_page_up || func == to_prev_block) {
if (curlint->prev != NULL)
curlint = curlint->prev;
else if (last_wait != time(NULL)) {
@@ -2830,7 +2830,7 @@ void do_linter(void)
last_wait = time(NULL);
statusline(NOTICE, curlint->msg);
}
- } else if (func == do_page_down || func == do_next_block) {
+ } else if (func == do_page_down || func == to_next_block) {
if (curlint->next != NULL)
curlint = curlint->next;
else if (last_wait != time(NULL)) {
