mirror of git://git.sv.gnu.org/nano.git
tweaks: rename a variable, for consistency
This commit is contained in:
parent
925ad6393a
commit
7013039c3a
16
src/move.c
16
src/move.c
|
@ -149,7 +149,7 @@ void do_page_down(void)
|
||||||
* afterwards. */
|
* afterwards. */
|
||||||
void do_para_begin(bool allow_update)
|
void do_para_begin(bool allow_update)
|
||||||
{
|
{
|
||||||
filestruct *current_save = openfile->current;
|
filestruct *was_current = openfile->current;
|
||||||
|
|
||||||
if (openfile->current != openfile->fileage) {
|
if (openfile->current != openfile->fileage) {
|
||||||
do {
|
do {
|
||||||
|
@ -161,7 +161,7 @@ void do_para_begin(bool allow_update)
|
||||||
openfile->current_x = 0;
|
openfile->current_x = 0;
|
||||||
|
|
||||||
if (allow_update)
|
if (allow_update)
|
||||||
edit_redraw(current_save);
|
edit_redraw(was_current);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Move up to the beginning of the last beginning-of-paragraph line
|
/* Move up to the beginning of the last beginning-of-paragraph line
|
||||||
|
@ -179,7 +179,7 @@ void do_para_begin_void(void)
|
||||||
* 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 allow_update)
|
||||||
{
|
{
|
||||||
filestruct *current_save = openfile->current;
|
filestruct *was_current = openfile->current;
|
||||||
|
|
||||||
while (openfile->current != openfile->filebot &&
|
while (openfile->current != openfile->filebot &&
|
||||||
!inpar(openfile->current))
|
!inpar(openfile->current))
|
||||||
|
@ -199,7 +199,7 @@ void do_para_end(bool allow_update)
|
||||||
openfile->current_x = strlen(openfile->current->data);
|
openfile->current_x = strlen(openfile->current->data);
|
||||||
|
|
||||||
if (allow_update)
|
if (allow_update)
|
||||||
edit_redraw(current_save);
|
edit_redraw(was_current);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* 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.
|
||||||
|
@ -256,7 +256,7 @@ void do_next_block(void)
|
||||||
* screen afterwards. */
|
* screen afterwards. */
|
||||||
void do_prev_word(bool allow_punct, bool allow_update)
|
void do_prev_word(bool allow_punct, bool allow_update)
|
||||||
{
|
{
|
||||||
filestruct *current_save = openfile->current;
|
filestruct *was_current = openfile->current;
|
||||||
bool seen_a_word = FALSE, step_forward = FALSE;
|
bool seen_a_word = FALSE, step_forward = FALSE;
|
||||||
|
|
||||||
assert(openfile->current != NULL && openfile->current->data != NULL);
|
assert(openfile->current != NULL && openfile->current->data != NULL);
|
||||||
|
@ -296,7 +296,7 @@ void do_prev_word(bool allow_punct, bool allow_update)
|
||||||
/* If allow_update is TRUE, update the screen. */
|
/* If allow_update is TRUE, update the screen. */
|
||||||
if (allow_update) {
|
if (allow_update) {
|
||||||
focusing = FALSE;
|
focusing = FALSE;
|
||||||
edit_redraw(current_save);
|
edit_redraw(was_current);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -313,7 +313,7 @@ void do_prev_word_void(void)
|
||||||
* otherwise. */
|
* otherwise. */
|
||||||
bool do_next_word(bool allow_punct, bool allow_update)
|
bool do_next_word(bool allow_punct, bool allow_update)
|
||||||
{
|
{
|
||||||
filestruct *current_save = 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 +
|
||||||
openfile->current_x, allow_punct);
|
openfile->current_x, allow_punct);
|
||||||
bool seen_space = !started_on_word;
|
bool seen_space = !started_on_word;
|
||||||
|
@ -348,7 +348,7 @@ bool do_next_word(bool allow_punct, bool allow_update)
|
||||||
/* If allow_update is TRUE, update the screen. */
|
/* If allow_update is TRUE, update the screen. */
|
||||||
if (allow_update) {
|
if (allow_update) {
|
||||||
focusing = FALSE;
|
focusing = FALSE;
|
||||||
edit_redraw(current_save);
|
edit_redraw(was_current);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Return whether we started on a word. */
|
/* Return whether we started on a word. */
|
||||||
|
|
Loading…
Reference in New Issue