summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorK.Takata <kentkt@csc.jp>2022-09-05 21:45:11 +0100
committerBram Moolenaar <Bram@vim.org>2022-09-05 21:45:11 +0100
commite53a0d44090753d6284b34cc7fb5cf6c765d562c (patch)
treec144f5a67752fb407b18e6901410ba2523ea3852
parent3411265a3698c3d5ef56d9b0c3bb237a9f5fdba1 (diff)
patch 9.0.0392: inverted condition is a bit confusingv9.0.0392
Problem: Inverted condition is a bit confusing. Solution: Remove the "!" and swap the blocks. (Ken Takata)
-rw-r--r--src/os_win32.c16
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 8 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index f6bf91d9fa..d936e4f087 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -8197,20 +8197,20 @@ get_default_console_color(
ctermbg = -1;
if (id > 0)
syn_id2cterm_bg(id, &ctermfg, &ctermbg);
- if (!USE_WT)
- {
- guibg = ctermbg != -1 ? ctermtoxterm(ctermbg)
- : default_console_color_bg;
- cterm_normal_bg_gui_color = guibg;
- ctermbg = ctermbg < 0 ? 0 : ctermbg;
- }
- else
+ if (USE_WT)
{
cterm_normal_bg_gui_color = guibg =
ctermbg != -1 ? ctermtoxterm(ctermbg) : INVALCOLOR;
if (ctermbg < 0)
ctermbg = 0;
}
+ else
+ {
+ guibg = ctermbg != -1 ? ctermtoxterm(ctermbg)
+ : default_console_color_bg;
+ cterm_normal_bg_gui_color = guibg;
+ ctermbg = ctermbg < 0 ? 0 : ctermbg;
+ }
}
*cterm_fg = ctermfg;
diff --git a/src/version.c b/src/version.c
index 2edbe83bf1..87603fc4b0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 392,
+/**/
391,
/**/
390,