Commit 538dc352 authored by David Lawrence Ramsey's avatar David Lawrence Ramsey
Browse files

a few more miscellaneous color fixes

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2868 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
No related merge requests found
Showing with 7 additions and 5 deletions
+7 -5
......@@ -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;
......
......@@ -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. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment