From 4fc16848fa6345e3c2e6fc5ed958c1fc3952f6de Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Fri, 18 Dec 2015 10:45:35 +0000 Subject: [PATCH] Adjusting the whitespace after the previous change, and adding a comment. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5496 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 +- src/color.c | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index f430738d..86c465fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2015-12-18 Benno Schulenberg - * src/color.c (color_init): Use less #ifdefs. + * src/color.c (color_init): Use less #ifdefs, and adjust indentation. 2015-12-11 Benno Schulenberg * doc/syntax/Makefile.am: Add missing autoconf and nftables syntaxes. diff --git a/src/color.c b/src/color.c index a005eebb..7f1b3128 100644 --- a/src/color.c +++ b/src/color.c @@ -116,23 +116,22 @@ void color_init(void) using_defaults = (use_default_colors() != ERR); #endif - for (; tmpcolor != NULL; - tmpcolor = tmpcolor->next) { - foreground = tmpcolor->fg; - background = tmpcolor->bg; - - if (foreground == -1 && !using_defaults) - foreground = COLOR_WHITE; + /* For each coloring expression, initialize the color pair. */ + for (; tmpcolor != NULL; tmpcolor = tmpcolor->next) { + foreground = tmpcolor->fg; + background = tmpcolor->bg; - if (background == -1 && !using_defaults) - background = COLOR_BLACK; + if (foreground == -1 && !using_defaults) + foreground = COLOR_WHITE; - init_pair(tmpcolor->pairnum, foreground, background); + if (background == -1 && !using_defaults) + background = COLOR_BLACK; + init_pair(tmpcolor->pairnum, foreground, background); #ifdef DEBUG fprintf(stderr, "init_pair(): fg = %hd, bg = %hd\n", foreground, background); #endif - } + } } /* Clean up a regex we previously compiled. */ -- 2.39.5