diff --git a/ChangeLog b/ChangeLog index 7936d5272e00f9570de1caf72c57dfd1910fe1d2..e2df47ee8e1a777a80161a90ec32acd52e3bd25f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2016-01-14 Benno Schulenberg <bensberg@justemail.net> - * doc/nanorc.sample.in: Remove reference to an obsolete file. + * 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. 2016-01-13 Benno Schulenberg <bensberg@justemail.net> * src/files.c (save_poshistory): Reduce the indentation. @@ -71,7 +72,7 @@ GNU nano 2.5.1 - 2016.01.11 2015-12-31 Benno Schulenberg <bensberg@justemail.net> * src/text.c (do_formatter): Restore the cursor position differently. * src/search.c (do_gotopos): Delete this now unused function. - * src/search.c (do_gotolinecolumn): Chop an always FALSE parameter. + * src/search.c (do_gotolinecolumn): Chop an always-FALSE parameter. * src/search.c (do_gotolinecolumn): Chop a duplicate parameter -- 'allow_update' always has the same value as 'interactive'. diff --git a/src/winio.c b/src/winio.c index b704c96294b50d98f7ea7880c7203ce231a245ee..985fe087f1c33b27fd1bbda80430a6d0bf996023 100644 --- a/src/winio.c +++ b/src/winio.c @@ -2994,9 +2994,6 @@ void edit_redraw(filestruct *old_current, size_t pww_save) ssize_t old_lineno; filestruct *old_edittop = openfile->edittop; - if (old_edittop->lineno < openfile->edittop->lineno) - old_lineno = old_edittop->lineno; - else old_lineno = (old_edittop->lineno + maxrows <= openfile->filebot->lineno) ? old_edittop->lineno + editwinrows :