remove do_(left|right)()'s ability to optionally not update the current

line, as this was only used in do_backspace(), and it didn't always
update the screen properly


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3017 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-09-13 04:53:44 +00:00
parent feb89db8a0
commit 1c3bfa9f2b
5 changed files with 15 additions and 21 deletions

View File

@ -158,6 +158,12 @@ CVS code -
nano.texi, and nanorc.sample. (DLR, suggested by Mike nano.texi, and nanorc.sample. (DLR, suggested by Mike
Frysinger) Frysinger)
- Update email address. Changes to faq.html and AUTHORS. (DLR) - Update email address. Changes to faq.html and AUTHORS. (DLR)
- Remove do_(left|right)()'s ability to optionally not update
the current line, as this was only used in do_backspace(), and
it didn't always update the screen properly. Changes to
shortcut_init(), do_left(), do_right(), and do_backspace();
removal of do_left_void() and do_right_void(). (DLR; problem
found by Mike Frysinger)
- color.c: - color.c:
- Remove unneeded fcntl.h include. (DLR) - Remove unneeded fcntl.h include. (DLR)
- chars.c: - chars.c:

View File

@ -497,11 +497,11 @@ void shortcut_init(bool unjustify)
sc_init_one(&main_list, NANO_FORWARD_KEY, N_("Forward"), sc_init_one(&main_list, NANO_FORWARD_KEY, N_("Forward"),
IFHELP(nano_forward_msg, NANO_NO_KEY), NANO_NO_KEY, IFHELP(nano_forward_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, do_right_void); NANO_NO_KEY, VIEW, do_right);
sc_init_one(&main_list, NANO_BACK_KEY, N_("Back"), sc_init_one(&main_list, NANO_BACK_KEY, N_("Back"),
IFHELP(nano_back_msg, NANO_NO_KEY), NANO_NO_KEY, IFHELP(nano_back_msg, NANO_NO_KEY), NANO_NO_KEY,
NANO_NO_KEY, VIEW, do_left_void); NANO_NO_KEY, VIEW, do_left);
sc_init_one(&main_list, NANO_HOME_KEY, N_("Home"), sc_init_one(&main_list, NANO_HOME_KEY, N_("Home"),
IFHELP(nano_home_msg, NANO_NO_KEY), NANO_NO_KEY, IFHELP(nano_home_msg, NANO_NO_KEY), NANO_NO_KEY,

View File

@ -550,7 +550,7 @@ void do_down(void)
} }
} }
void do_left(bool allow_update) void do_left(void)
{ {
size_t pww_save = openfile->placewewant; size_t pww_save = openfile->placewewant;
@ -566,16 +566,11 @@ void do_left(bool allow_update)
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
if (allow_update && need_horizontal_update(pww_save)) if (need_horizontal_update(pww_save))
update_line(openfile->current, openfile->current_x); update_line(openfile->current, openfile->current_x);
} }
void do_left_void(void) void do_right(void)
{
do_left(TRUE);
}
void do_right(bool allow_update)
{ {
size_t pww_save = openfile->placewewant; size_t pww_save = openfile->placewewant;
@ -593,11 +588,6 @@ void do_right(bool allow_update)
openfile->placewewant = xplustabs(); openfile->placewewant = xplustabs();
if (allow_update && need_horizontal_update(pww_save)) if (need_horizontal_update(pww_save))
update_line(openfile->current, openfile->current_x); update_line(openfile->current, openfile->current_x);
} }
void do_right_void(void)
{
do_right(TRUE);
}

View File

@ -334,10 +334,8 @@ void do_home(void);
void do_end(void); void do_end(void);
void do_up(void); void do_up(void);
void do_down(void); void do_down(void);
void do_left(bool allow_update); void do_left(void);
void do_left_void(void); void do_right(void);
void do_right(bool allow_update);
void do_right_void(void);
/* Public functions in nano.c. */ /* Public functions in nano.c. */
filestruct *make_new_node(filestruct *prevnode); filestruct *make_new_node(filestruct *prevnode);

View File

@ -153,7 +153,7 @@ void do_backspace(void)
{ {
if (openfile->current != openfile->fileage || if (openfile->current != openfile->fileage ||
openfile->current_x > 0) { openfile->current_x > 0) {
do_left(FALSE); do_left();
do_delete(); do_delete();
} }
} }