From 8a9f71639fb5afb6af5bad3baf01dfe3dcc68abb Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Thu, 14 Jan 2016 13:41:45 +0000 Subject: [PATCH] Eliding an unneeded variable and adjusting some wrappings and whitespace. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5559 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ src/winio.c | 20 +++++++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2df47ee..d255ddad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * doc/nanorc.sample.in: Remove a reference to an obsolete file. Reported by Mike Frysinger. * src/winio.c (edit_redraw): Delete an 'if' that is always FALSE. + * src/winio.c (edit_redraw): Elide an unneeded variable and adjust + some wrappings and whitespace. 2016-01-13 Benno Schulenberg * src/files.c (save_poshistory): Reduce the indentation. diff --git a/src/winio.c b/src/winio.c index 985fe087..5e2c73e6 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2977,10 +2977,9 @@ void edit_redraw(filestruct *old_current, size_t pww_save) /* If either old_current or current is offscreen, scroll the edit * window until it's onscreen and get out. */ if (old_current->lineno < openfile->edittop->lineno || - old_current->lineno >= openfile->edittop->lineno + - maxrows || openfile->current->lineno < - openfile->edittop->lineno || openfile->current->lineno >= - openfile->edittop->lineno + maxrows) { + old_current->lineno >= openfile->edittop->lineno + maxrows || + openfile->current->lineno < openfile->edittop->lineno || + openfile->current->lineno >= openfile->edittop->lineno + maxrows) { #ifdef DEBUG fprintf(stderr, "edit_redraw(): line %ld was offscreen, oldcurrent = %ld edittop = %ld", (long)openfile->current->lineno, (long)old_current->lineno, (long)openfile->edittop->lineno); @@ -2992,20 +2991,19 @@ void edit_redraw(filestruct *old_current, size_t pww_save) * whether we've scrolled up or down) of the edit window. */ if (openfile->mark_set) { ssize_t old_lineno; - filestruct *old_edittop = openfile->edittop; - old_lineno = (old_edittop->lineno + maxrows <= - openfile->filebot->lineno) ? - old_edittop->lineno + editwinrows : - openfile->filebot->lineno; + if (openfile->edittop->lineno + maxrows <= openfile->filebot->lineno) + old_lineno = openfile->edittop->lineno + editwinrows; + else + old_lineno = openfile->filebot->lineno; foo = old_current; while (foo->lineno != old_lineno) { update_line(foo, 0); - foo = (foo->lineno > old_lineno) ? foo->prev : - foo->next; + foo = (foo->lineno > old_lineno) ? + foo->prev : foo->next; } } #endif /* !NANO_TINY */ -- 2.39.5