tweaks: group all movement routines in corresponding pairs
parent
86e71fa09d
commit
54a92614b2
38
src/move.c
38
src/move.c
|
@ -149,12 +149,6 @@ void do_para_begin(bool update_screen)
|
||||||
edit_redraw(was_current, CENTERING);
|
edit_redraw(was_current, CENTERING);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Move up to first start of a paragraph before the current line. */
|
|
||||||
void do_para_begin_void(void)
|
|
||||||
{
|
|
||||||
do_para_begin(TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Move down to the beginning of the last line of the current paragraph.
|
/* Move down to the beginning of the last line of the current paragraph.
|
||||||
* Then move down one line farther if there is such a line, or to the
|
* Then move down one line farther if there is such a line, or to the
|
||||||
* end of the current line if not. If update_screen is TRUE, update the
|
* end of the current line if not. If update_screen is TRUE, update the
|
||||||
|
@ -185,6 +179,12 @@ void do_para_end(bool update_screen)
|
||||||
edit_redraw(was_current, CENTERING);
|
edit_redraw(was_current, CENTERING);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Move up to first start of a paragraph before the current line. */
|
||||||
|
void do_para_begin_void(void)
|
||||||
|
{
|
||||||
|
do_para_begin(TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
/* Move down to just after the first end of a paragraph. */
|
/* Move down to just after the first end of a paragraph. */
|
||||||
void do_para_end_void(void)
|
void do_para_end_void(void)
|
||||||
{
|
{
|
||||||
|
@ -276,13 +276,6 @@ void do_prev_word(bool allow_punct, bool update_screen)
|
||||||
edit_redraw(was_current, FLOWING);
|
edit_redraw(was_current, FLOWING);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Move to the previous word in the file, treating punctuation as part of a
|
|
||||||
* word if the WORD_BOUNDS flag is set, and update the screen afterwards. */
|
|
||||||
void do_prev_word_void(void)
|
|
||||||
{
|
|
||||||
do_prev_word(ISSET(WORD_BOUNDS), TRUE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Move to the next word in the file. If allow_punct is TRUE, treat
|
/* Move to the next word in the file. If allow_punct is TRUE, treat
|
||||||
* punctuation as part of a word. If update_screen is TRUE, update the
|
* punctuation as part of a word. If update_screen is TRUE, update the
|
||||||
* screen afterwards. Return TRUE if we started on a word, and FALSE
|
* screen afterwards. Return TRUE if we started on a word, and FALSE
|
||||||
|
@ -326,6 +319,13 @@ bool do_next_word(bool allow_punct, bool update_screen)
|
||||||
return started_on_word;
|
return started_on_word;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Move to the previous word in the file, treating punctuation as part of a
|
||||||
|
* word if the WORD_BOUNDS flag is set, and update the screen afterwards. */
|
||||||
|
void do_prev_word_void(void)
|
||||||
|
{
|
||||||
|
do_prev_word(ISSET(WORD_BOUNDS), TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
/* Move to the next word in the file, treating punctuation as part of a word
|
/* Move to the next word in the file, treating punctuation as part of a word
|
||||||
* if the WORD_BOUNDS flag is set, and update the screen afterwards. */
|
* if the WORD_BOUNDS flag is set, and update the screen afterwards. */
|
||||||
void do_next_word_void(void)
|
void do_next_word_void(void)
|
||||||
|
@ -486,12 +486,6 @@ void do_up(bool scroll_only)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Move up one line or chunk. */
|
|
||||||
void do_up_void(void)
|
|
||||||
{
|
|
||||||
do_up(FALSE);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Move the cursor to next line or chunk. If scroll_only is TRUE, also
|
/* Move the cursor to next line or chunk. If scroll_only is TRUE, also
|
||||||
* scroll the screen one row, so the cursor stays in the same spot. */
|
* scroll the screen one row, so the cursor stays in the same spot. */
|
||||||
void do_down(bool scroll_only)
|
void do_down(bool scroll_only)
|
||||||
|
@ -530,6 +524,12 @@ void do_down(bool scroll_only)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Move up one line or chunk. */
|
||||||
|
void do_up_void(void)
|
||||||
|
{
|
||||||
|
do_up(FALSE);
|
||||||
|
}
|
||||||
|
|
||||||
/* Move down one line or chunk. */
|
/* Move down one line or chunk. */
|
||||||
void do_down_void(void)
|
void do_down_void(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -357,28 +357,28 @@ size_t help_line_len(const char *ptr);
|
||||||
#endif
|
#endif
|
||||||
void do_help_void(void);
|
void do_help_void(void);
|
||||||
|
|
||||||
/* All functions in move.c. */
|
/* Most functions in move.c. */
|
||||||
void do_first_line(void);
|
void do_first_line(void);
|
||||||
void do_last_line(void);
|
void do_last_line(void);
|
||||||
void do_page_up(void);
|
void do_page_up(void);
|
||||||
void do_page_down(void);
|
void do_page_down(void);
|
||||||
#ifndef DISABLE_JUSTIFY
|
#ifndef DISABLE_JUSTIFY
|
||||||
void do_para_begin(bool update_screen);
|
void do_para_begin(bool update_screen);
|
||||||
void do_para_begin_void(void);
|
|
||||||
void do_para_end(bool update_screen);
|
void do_para_end(bool update_screen);
|
||||||
|
void do_para_begin_void(void);
|
||||||
void do_para_end_void(void);
|
void do_para_end_void(void);
|
||||||
#endif
|
#endif
|
||||||
void do_prev_block(void);
|
void do_prev_block(void);
|
||||||
void do_next_block(void);
|
void do_next_block(void);
|
||||||
void do_prev_word(bool allow_punct, bool update_screen);
|
void do_prev_word(bool allow_punct, bool update_screen);
|
||||||
void do_prev_word_void(void);
|
|
||||||
bool do_next_word(bool allow_punct, bool update_screen);
|
bool do_next_word(bool allow_punct, bool update_screen);
|
||||||
|
void do_prev_word_void(void);
|
||||||
void do_next_word_void(void);
|
void do_next_word_void(void);
|
||||||
void do_home(void);
|
void do_home(void);
|
||||||
void do_end(void);
|
void do_end(void);
|
||||||
void do_up(bool scroll_only);
|
void do_up(bool scroll_only);
|
||||||
void do_up_void(void);
|
|
||||||
void do_down(bool scroll_only);
|
void do_down(bool scroll_only);
|
||||||
|
void do_up_void(void);
|
||||||
void do_down_void(void);
|
void do_down_void(void);
|
||||||
#ifndef NANO_TINY
|
#ifndef NANO_TINY
|
||||||
void do_scroll_up(void);
|
void do_scroll_up(void);
|
||||||
|
|
Loading…
Reference in New Issue