- winio.c:edit_refresh() - Rename lines to nlines to fix AIX breakage (reported by...

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

diff --git a/ChangeLog b/ChangeLog
index 1e8c76df3a2a90b4996f1b555e6ddfeed9636b41..cbe537b4815b452d30096fe50bf7ee6196def64f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 CVS Code -
+- winio.c:
+  edit_refresh()
+       - Rename lines to nlines to fix AIX breakage (reported by
+         Dennis Cranston, re-reported by arh14@cornell.edu).
 - po/pl.po:
        - New Polish, partial translation, by Cezary Sliwa <sliwa@cft.edu.pl>.
 - po/it.po:

diff --git a/winio.c b/winio.c
index c70b6e6f44b94eb4ce7c1eca865994e7f2d4dd3c..9cb6410c122af428299af315d7264b99e04cff26 100644 (file)
--- a/winio.c
+++ b/winio.c
@@ -874,7 +874,7 @@ void center_cursor(void)
 void edit_refresh(void)
 {
     static int noloop = 0;
-    int lines = 0, i = 0, currentcheck = 0;
+    int nlines = 0, i = 0, currentcheck = 0;
     filestruct *temp, *hold = current;
 
     if (current == NULL)
@@ -882,14 +882,14 @@ void edit_refresh(void)
 
     temp = edittop;
 
-    while (lines <= editwinrows - 1 && lines <= totlines && temp != NULL) {
+    while (nlines <= editwinrows - 1 && nlines <= totlines && temp != NULL) {
        hold = temp;
        update_line(temp, current_x);
        if (temp == current)
            currentcheck = 1;
 
        temp = temp->next;
-       lines++;
+       nlines++;
     }
     /* If noloop == 1, then we already did an edit_update without finishing
        this function.  So we don't run edit_update again */
@@ -899,10 +899,10 @@ void edit_refresh(void)
     } else if (noloop)
        noloop = 0;
 
-    if (lines <= editwinrows - 1)
-       while (lines <= editwinrows - 1) {
-           mvwaddstr(edit, lines, i, hblank);
-           lines++;
+    if (nlines <= editwinrows - 1)
+       while (nlines <= editwinrows - 1) {
+           mvwaddstr(edit, nlines, i, hblank);
+           nlines++;
        }
     if (temp == NULL)
        editbot = hold;