back to svn, and:

* winio.c: Clean up some unused variables from the soft wrapping code.

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

diff --git a/ChangeLog b/ChangeLog
index ab345d623184fbc4f51abaeca626d9533a48e117..31e1055d683ec91e2b12b4d44d9cf145346aeef9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2009-09-15 Chris Allegretta <chrisa@asty.org>
+       * winio.c: Clean up some unused variables from the soft wrapping code.
+
 GNU nano 2.1.11 - 2009.09.14
 2009-09-12 Chris Allegretta <chrisa@asty.org>
        * winio.c (edit_update) - properly update edittop when using soft wrapping.

diff --git a/configure.ac b/configure.ac
index d9c7ba15771c397a8b639324881502c57efa8478..776afb58390c3af2188811ef19ee75bb4f3bad31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 #
 # $Id$
 
-AC_INIT([GNU nano], [2.1.11], [nano-devel@gnu.org], [nano])
+AC_INIT([GNU nano], [2.1.11-svn], [nano-devel@gnu.org], [nano])
 AC_CONFIG_SRCDIR([src/nano.c])
 AC_CANONICAL_TARGET([])
 AM_INIT_AUTOMAKE

diff --git a/src/winio.c b/src/winio.c
index ed2990205987685760a682683d09df92a90882d8..95f079efa953a3a541ce91cedcfa8c9dc1822d1c 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2849,7 +2849,7 @@ int update_line(filestruct *fileptr, size_t index)
        line = fileptr->lineno - openfile->edittop->lineno;
 
     if (line < 0 || line >= editwinrows)
-       return;
+       return 1;
 
     /* First, blank out the line. */
     blank_line(edit, line, 0, COLS);
@@ -3076,7 +3076,6 @@ void edit_redraw(filestruct *old_current, size_t pww_save)
     bool do_redraw = need_vertical_update(0) ||
        need_vertical_update(pww_save);
     filestruct *foo = NULL;
-    ssize_t i = 0, extracuzsoft = 0;
 
     /* If either old_current or current is offscreen, scroll the edit
      * window until it's onscreen and get out. */