fix edit_scroll() redundancy

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2884 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/src/winio.c b/src/winio.c
index 4ce297dbdab17fa30a5a86de8d35e49b487e8ee4..268c4bf8a24f836846f0dd13818eb52717d123d8 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -3544,9 +3544,10 @@ void edit_scroll(updown direction, int nlines)
        openfile->fileage)
        nlines = editwinrows;
 
-    /* Add two to nlines, to account for the lines before and after the
-     * scrolled region. */
-    nlines += 2;
+    /* Make nlines account for the lines before and after the scrolled
+     * region, if they're onsccreen. */
+    nlines += (nlines <= editwinrows - 2) ? 2 :
+       (nlines == editwinrows - 1) ? 1 : 0;
 
     /* If we scrolled up, we're on the line before the scrolled
      * region. */