From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Thu, 14 Jul 2005 23:06:22 +0000 (+0000)
Subject: more miscellaneous breakage fixes
X-Git-Tag: v1.3.9~183
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=443a766fe292c648fe267674d3dac72fcc8b3a43;p=nano.git

more miscellaneous breakage fixes


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

diff --git a/src/files.c b/src/files.c
index 26b1746d..848d2c8d 100644
--- a/src/files.c
+++ b/src/files.c
@@ -230,7 +230,15 @@ void open_buffer(const char *filename)
 /* Update the screen to account for the current buffer. */
 void display_buffer(void)
 {
+    /* Update the titlebar, since the filename may have changed. */
     titlebar(NULL);
+
+#ifdef ENABLE_COLOR
+    /* Update the buffer's associated colors, if applicable. */
+    color_update();
+#endif
+
+    /* Update the edit window. */
     edit_refresh();
 }
 
diff --git a/src/nano.c b/src/nano.c
index 2d7338e8..770afe37 100644
--- 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/winio.c b/src/winio.c
index 3f0481b1..1d7a0b00 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -3510,7 +3510,7 @@ int need_vertical_update(size_t old_pww)
  * two is the current line at either time. */
 void edit_scroll(updown direction, int nlines)
 {
-    filestruct *foo;
+    const filestruct *foo;
     int i, scroll_rows = 0;
 
     /* Scrolling less than one line or more than editwinrows lines is