To: vim_dev@googlegroups.com Subject: Patch 9.0.0392 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0392 Problem: Inverted condition is a bit confusing. Solution: Remove the "!" and swap the blocks. (Ken Takata) Files: src/os_win32.c *** ../vim-9.0.0391/src/os_win32.c 2022-09-01 13:19:53.410957280 +0100 --- src/os_win32.c 2022-09-01 13:49:26.920207199 +0100 *************** *** 8197,8216 **** 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 { cterm_normal_bg_gui_color = guibg = ctermbg != -1 ? ctermtoxterm(ctermbg) : INVALCOLOR; if (ctermbg < 0) ctermbg = 0; } } *cterm_fg = ctermfg; --- 8197,8216 ---- ctermbg = -1; if (id > 0) syn_id2cterm_bg(id, &ctermfg, &ctermbg); ! 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; *** ../vim-9.0.0391/src/version.c 2022-09-05 21:40:40.438306254 +0100 --- src/version.c 2022-09-05 21:44:46.269898855 +0100 *************** *** 705,706 **** --- 705,708 ---- { /* Add new patch number below this line */ + /**/ + 392, /**/ -- "How is your new girlfriend?" "90-60-90 man!" "What, pale purple?" /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///