a few more miscellaneous color fixes

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

diff --git a/src/color.c b/src/color.c
index 451920934415cc40cec9e4bf1aff17ff51fc445a..b1085822802eb59d0e679f283ec80bead84fb073 100644 (file)
--- a/src/color.c
+++ b/src/color.c
@@ -64,11 +64,12 @@ void set_colorpairs(void)
     }
 }
 
+/* Initialize the color information. */
 void color_init(void)
 {
     assert(openfile != NULL);
 
-    if (has_colors()) {
+    if (has_colors() && can_change_color()) {
        const colortype *tmpcolor;
 #ifdef HAVE_USE_DEFAULT_COLORS
        bool defok;

diff --git a/src/files.c b/src/files.c
index 848d2c8d430555e39332b5dde2ad7efb8ba7753c..871e712213a7b3f6ab3a519cb359d49fc18b1b80 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -220,8 +220,8 @@ void open_buffer(const char *filename)
        openfile->current = openfile->fileage;
 
 #ifdef ENABLE_COLOR
-    /* If we're loading into a new buffer, update the buffer's
-     * associated colors, if applicable. */
+    /* If we're loading into a new buffer, update the colors to account
+     * for it, if applicable. */
     if (new_buffer)
        color_update();
 #endif
@@ -234,8 +234,9 @@ void display_buffer(void)
     titlebar(NULL);
 
 #ifdef ENABLE_COLOR
-    /* Update the buffer's associated colors, if applicable. */
-    color_update();
+    /* Make sure we're using the buffer's associated colors, if
+     * applicable. */
+    color_init();
 #endif
 
     /* Update the edit window. */