more miscellaneous minor fixes

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

diff --git a/ChangeLog b/ChangeLog
index f1ee5a93544a771a674159181c935ce94ba3cf53..403875f27b29bce6d4bdd281c41351794b9e63cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,8 +96,9 @@ CVS code -
   do_replace()
        - Blank out last_replace properly again just before displaying
          the "Replace" prompt. (DLR, found by Mike Frysinger)
+       - Remove unnecessary renumber(). (DLR)
 - winio.c:
-  edit_scroll()
+  edit_scroll(), edit_refresh()
        - Clean up and simplify. (DLR)
   do_statusbar_next_word()
        - Rework to be more like do_statusbar_prev_word(), to avoid a

diff --git a/src/nano.c b/src/nano.c
index 770afe37764d498b9b2f41d2c8cf204f07b4e24c..2d7338e815f4f8586af630673256af65fc48f500 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -191,7 +191,7 @@ void renumber(filestruct *fileptr)
     assert(fileptr != fileptr->next);
 
     for (; fileptr != NULL; fileptr = fileptr->next)
-       fileptr->lineno = line++;
+       fileptr->lineno = ++line;
 }
 
 /* Partition a filestruct so it begins at (top, top_x) and ends at (bot,

diff --git a/src/search.c b/src/search.c
index c169c18f5ccf98169f771884b57bde90cb75daf2..365a9f9bc7a8988a93bbb436a5fd96bfa49b5e38 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -956,7 +956,6 @@ void do_replace(void)
     openfile->current_x = begin_x;
     openfile->placewewant = pww_save;
 
-    renumber(openfile->fileage);
     edit_refresh();
 
     if (numreplaced >= 0)

diff --git a/src/winio.c b/src/winio.c
index 1d7a0b00c3cba9039886b77e035f3cbdb53ea916..8a469adfe6cd246d93d2e3161777e8fb9bdf08e1 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -3624,13 +3624,11 @@ void edit_refresh(void)
        fprintf(stderr, "edit_refresh(): edittop->lineno = %ld\n", (long)openfile->edittop->lineno);
 #endif
 
-       while (nlines < editwinrows) {
+       while (nlines < editwinrows && foo != NULL) {
            update_line(foo, (foo == openfile->current) ?
                openfile->current_x : 0);
-           nlines++;
-           if (foo->next == NULL)
-               break;
            foo = foo->next;
+           nlines++;
        }
        while (nlines < editwinrows) {
            blank_line(edit, nlines, 0, COLS);