ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename a few variables for consistency 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2173 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-12-07 21:22:48 +00:00
parent bed32a370b
commit 91851f3e60
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/move.c
View File

@ -32,37 +32,37 @@
void do_first_line(void) void do_first_line(void)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
current = fileage; current = fileage;
placewewant = 0; placewewant = 0;
current_x = 0; current_x = 0;
if (edittop != fileage || need_vertical_update(old_pww)) if (edittop != fileage || need_vertical_update(pww_save))
edit_update(TOP); edit_update(TOP);
} }
void do_last_line(void) void do_last_line(void)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
current = filebot; current = filebot;
placewewant = 0; placewewant = 0;
current_x = 0; current_x = 0;
if (edittop->lineno + (editwinrows / 2) != filebot->lineno || if (edittop->lineno + (editwinrows / 2) != filebot->lineno ||
need_vertical_update(old_pww)) need_vertical_update(pww_save))
edit_update(CENTER); edit_update(CENTER);
} }
void do_home(void) void do_home(void)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
#ifndef NANO_SMALL #ifndef NANO_SMALL
if (ISSET(SMART_HOME)) { if (ISSET(SMART_HOME)) {
size_t old_current_x = current_x; size_t current_save_x = current_x;
for (current_x = 0; isblank(current->data[current_x]) && for (current_x = 0; isblank(current->data[current_x]) &&
current->data[current_x] != '\0'; current_x++) current->data[current_x] != '\0'; current_x++)
; ;
if (current_x == old_current_x || current->data[current_x] == '\0') if (current_x == current_save_x || current->data[current_x] == '\0')
current_x = 0; current_x = 0;
placewewant = xplustabs(); placewewant = xplustabs();
@ -74,24 +74,24 @@ void do_home(void)
} }
#endif #endif
check_statusblank(); check_statusblank();
if (need_horizontal_update(old_pww)) if (need_horizontal_update(pww_save))
update_line(current, current_x); update_line(current, current_x);
} }
void do_end(void) void do_end(void)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
current_x = strlen(current->data); current_x = strlen(current->data);
placewewant = xplustabs(); placewewant = xplustabs();
check_statusblank(); check_statusblank();
if (need_horizontal_update(old_pww)) if (need_horizontal_update(pww_save))
update_line(current, current_x); update_line(current, current_x);
} }
void do_page_up(void) void do_page_up(void)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
const filestruct *old_current = current; const filestruct *current_save = current;
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPPING
wrap_reset(); wrap_reset();
#endif #endif
@ -129,15 +129,15 @@ void do_page_up(void)
current_x = actual_x(current->data, placewewant); current_x = actual_x(current->data, placewewant);
/* Update all the lines that need to be updated. */ /* Update all the lines that need to be updated. */
edit_redraw(old_current, old_pww); edit_redraw(current_save, pww_save);
check_statusblank(); check_statusblank();
} }
void do_page_down(void) void do_page_down(void)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
const filestruct *old_current = current; const filestruct *current_save = current;
#ifndef DISABLE_WRAPPING #ifndef DISABLE_WRAPPING
wrap_reset(); wrap_reset();
#endif #endif
@ -176,7 +176,7 @@ void do_page_down(void)
current_x = actual_x(current->data, placewewant); current_x = actual_x(current->data, placewewant);
/* Update all the lines that need to be updated. */ /* Update all the lines that need to be updated. */
edit_redraw(old_current, old_pww); edit_redraw(current_save, pww_save);
check_statusblank(); check_statusblank();
} }
@ -249,7 +249,7 @@ void do_down(void)
void do_left(int allow_update) void do_left(int allow_update)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
if (current_x > 0) if (current_x > 0)
current_x--; current_x--;
else if (current != fileage) { else if (current != fileage) {
@ -258,7 +258,7 @@ void do_left(int allow_update)
} }
placewewant = xplustabs(); placewewant = xplustabs();
check_statusblank(); check_statusblank();
if (allow_update && need_horizontal_update(old_pww)) if (allow_update && need_horizontal_update(pww_save))
update_line(current, current_x); update_line(current, current_x);
} }
@ -269,7 +269,7 @@ void do_left_void(void)
void do_right(int allow_update) void do_right(int allow_update)
{ {
size_t old_pww = placewewant; size_t pww_save = placewewant;
assert(current_x <= strlen(current->data)); assert(current_x <= strlen(current->data));
if (current->data[current_x] != '\0') if (current->data[current_x] != '\0')
@ -280,7 +280,7 @@ void do_right(int allow_update)
} }
placewewant = xplustabs(); placewewant = xplustabs();
check_statusblank(); check_statusblank();
if (allow_update && need_horizontal_update(old_pww)) if (allow_update && need_horizontal_update(pww_save))
update_line(current, current_x); update_line(current, current_x);
} }