mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweaks: rename a parameter, to be more imperative

This commit is contained in:
Benno Schulenberg 2017-04-17 12:01:03 +02:00
parent 74f128859b
commit 700c5c9399
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/move.c
View File

@ -133,10 +133,9 @@ void do_page_down(void)
} }
#ifndef DISABLE_JUSTIFY #ifndef DISABLE_JUSTIFY
/* Move up to the beginning of the last beginning-of-paragraph line /* Move to the beginning of the last beginning-of-paragraph line before the
* before the current line. If allow_update is TRUE, update the screen * current line. If update_screen is TRUE, update the screen afterwards. */
* afterwards. */ void do_para_begin(bool update_screen)
void do_para_begin(bool allow_update)
{ {
filestruct *was_current = openfile->current; filestruct *was_current = openfile->current;
@ -148,7 +147,7 @@ void do_para_begin(bool allow_update)
openfile->current_x = 0; openfile->current_x = 0;
if (allow_update) if (update_screen)
edit_redraw(was_current); edit_redraw(was_current);
} }
@ -160,11 +159,11 @@ void do_para_begin_void(void)
/* 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 allow_update is TRUE, update the * end of the current line if not. If update_screen is TRUE, update the
* screen afterwards. A line is the last line of a paragraph if it is * screen afterwards. A line is the last line of a paragraph if it is
* in a paragraph, and the next line either is the beginning line of a * in a paragraph, and the next line either is the beginning line of a
* paragraph or isn't in a paragraph. */ * paragraph or isn't in a paragraph. */
void do_para_end(bool allow_update) void do_para_end(bool update_screen)
{ {
filestruct *was_current = openfile->current; filestruct *was_current = openfile->current;
@ -184,7 +183,7 @@ void do_para_end(bool allow_update)
} else } else
openfile->current_x = strlen(openfile->current->data); openfile->current_x = strlen(openfile->current->data);
if (allow_update) if (update_screen)
edit_redraw(was_current); edit_redraw(was_current);
} }
@ -236,9 +235,9 @@ void do_next_block(void)
} }
/* Move to the previous word in the file. If allow_punct is TRUE, treat /* Move to the previous word in the file. If allow_punct is TRUE, treat
* punctuation as part of a word. If allow_update is TRUE, update the * punctuation as part of a word. If update_screen is TRUE, update the
* screen afterwards. */ * screen afterwards. */
void do_prev_word(bool allow_punct, bool allow_update) void do_prev_word(bool allow_punct, bool update_screen)
{ {
filestruct *was_current = openfile->current; filestruct *was_current = openfile->current;
bool seen_a_word = FALSE, step_forward = FALSE; bool seen_a_word = FALSE, step_forward = FALSE;
@ -275,8 +274,7 @@ void do_prev_word(bool allow_punct, bool allow_update)
openfile->current_x = move_mbright(openfile->current->data, openfile->current_x = move_mbright(openfile->current->data,
openfile->current_x); openfile->current_x);
/* If allow_update is TRUE, update the screen. */ if (update_screen) {
if (allow_update) {
focusing = FALSE; focusing = FALSE;
edit_redraw(was_current); edit_redraw(was_current);
} }
@ -290,10 +288,10 @@ void do_prev_word_void(void)
} }
/* 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 allow_update 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
* otherwise. */ * otherwise. */
bool do_next_word(bool allow_punct, bool allow_update) bool do_next_word(bool allow_punct, bool update_screen)
{ {
filestruct *was_current = openfile->current; filestruct *was_current = openfile->current;
bool started_on_word = is_word_mbchar(openfile->current->data + bool started_on_word = is_word_mbchar(openfile->current->data +
@ -325,8 +323,7 @@ bool do_next_word(bool allow_punct, bool allow_update)
break; break;
} }
/* If allow_update is TRUE, update the screen. */ if (update_screen) {
if (allow_update) {
focusing = FALSE; focusing = FALSE;
edit_redraw(was_current); edit_redraw(was_current);
} }

8
src/proto.h
View File

@ -350,16 +350,16 @@ 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 allow_update); void do_para_begin(bool update_screen);
void do_para_begin_void(void); void do_para_begin_void(void);
void do_para_end(bool allow_update); void do_para_end(bool update_screen);
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 allow_update); void do_prev_word(bool allow_punct, bool update_screen);
void do_prev_word_void(void); void do_prev_word_void(void);
bool do_next_word(bool allow_punct, bool allow_update); bool do_next_word(bool allow_punct, bool update_screen);
void do_next_word_void(void); void do_next_word_void(void);
void do_home(bool be_clever); void do_home(bool be_clever);
void do_home_void(void); void do_home_void(void);