diff --git a/colors/base16-3024.lua b/colors/base16-3024.lua index 5883336..4484fb4 100644 --- a/colors/base16-3024.lua +++ b/colors/base16-3024.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-apathy.lua b/colors/base16-apathy.lua index 7a3006d..ef0d6d4 100644 --- a/colors/base16-apathy.lua +++ b/colors/base16-apathy.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-apprentice.lua b/colors/base16-apprentice.lua index 3c9f887..11bc9ba 100644 --- a/colors/base16-apprentice.lua +++ b/colors/base16-apprentice.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-ashes.lua b/colors/base16-ashes.lua index 9c2ec2f..d7d0f66 100644 --- a/colors/base16-ashes.lua +++ b/colors/base16-ashes.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-cave-light.lua b/colors/base16-atelier-cave-light.lua index 35cf73f..a26deb8 100644 --- a/colors/base16-atelier-cave-light.lua +++ b/colors/base16-atelier-cave-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-cave.lua b/colors/base16-atelier-cave.lua index c23ed02..1ce7978 100644 --- a/colors/base16-atelier-cave.lua +++ b/colors/base16-atelier-cave.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-dune-light.lua b/colors/base16-atelier-dune-light.lua index f4063de..8207a47 100644 --- a/colors/base16-atelier-dune-light.lua +++ b/colors/base16-atelier-dune-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-dune.lua b/colors/base16-atelier-dune.lua index b58e6c5..441f23f 100644 --- a/colors/base16-atelier-dune.lua +++ b/colors/base16-atelier-dune.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-estuary-light.lua b/colors/base16-atelier-estuary-light.lua index 9adde80..52267f7 100644 --- a/colors/base16-atelier-estuary-light.lua +++ b/colors/base16-atelier-estuary-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-estuary.lua b/colors/base16-atelier-estuary.lua index 393e5df..51bd9a4 100644 --- a/colors/base16-atelier-estuary.lua +++ b/colors/base16-atelier-estuary.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-forest-light.lua b/colors/base16-atelier-forest-light.lua index 472cbe6..db81276 100644 --- a/colors/base16-atelier-forest-light.lua +++ b/colors/base16-atelier-forest-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-forest.lua b/colors/base16-atelier-forest.lua index 521f27f..bc69dda 100644 --- a/colors/base16-atelier-forest.lua +++ b/colors/base16-atelier-forest.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-heath-light.lua b/colors/base16-atelier-heath-light.lua index 7a6b4dc..0fadb46 100644 --- a/colors/base16-atelier-heath-light.lua +++ b/colors/base16-atelier-heath-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-heath.lua b/colors/base16-atelier-heath.lua index 9a9898a..586b249 100644 --- a/colors/base16-atelier-heath.lua +++ b/colors/base16-atelier-heath.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-lakeside-light.lua b/colors/base16-atelier-lakeside-light.lua index 1dcf39a..212bb81 100644 --- a/colors/base16-atelier-lakeside-light.lua +++ b/colors/base16-atelier-lakeside-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-lakeside.lua b/colors/base16-atelier-lakeside.lua index 5b9361b..927e81a 100644 --- a/colors/base16-atelier-lakeside.lua +++ b/colors/base16-atelier-lakeside.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-plateau-light.lua b/colors/base16-atelier-plateau-light.lua index c5dfdee..1623fee 100644 --- a/colors/base16-atelier-plateau-light.lua +++ b/colors/base16-atelier-plateau-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-plateau.lua b/colors/base16-atelier-plateau.lua index de3d3d4..ec85cb3 100644 --- a/colors/base16-atelier-plateau.lua +++ b/colors/base16-atelier-plateau.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-savanna-light.lua b/colors/base16-atelier-savanna-light.lua index 40d4fd2..1111f80 100644 --- a/colors/base16-atelier-savanna-light.lua +++ b/colors/base16-atelier-savanna-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-savanna.lua b/colors/base16-atelier-savanna.lua index 5e916b0..915c5f0 100644 --- a/colors/base16-atelier-savanna.lua +++ b/colors/base16-atelier-savanna.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-seaside-light.lua b/colors/base16-atelier-seaside-light.lua index 19dc156..dc521a6 100644 --- a/colors/base16-atelier-seaside-light.lua +++ b/colors/base16-atelier-seaside-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-seaside.lua b/colors/base16-atelier-seaside.lua index cfcb431..f80ba9d 100644 --- a/colors/base16-atelier-seaside.lua +++ b/colors/base16-atelier-seaside.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-sulphurpool-light.lua b/colors/base16-atelier-sulphurpool-light.lua index 587a8f8..748d49b 100644 --- a/colors/base16-atelier-sulphurpool-light.lua +++ b/colors/base16-atelier-sulphurpool-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atelier-sulphurpool.lua b/colors/base16-atelier-sulphurpool.lua index 003f538..98d47e6 100644 --- a/colors/base16-atelier-sulphurpool.lua +++ b/colors/base16-atelier-sulphurpool.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-atlas.lua b/colors/base16-atlas.lua index 19c879c..e438667 100644 --- a/colors/base16-atlas.lua +++ b/colors/base16-atlas.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-bespin.lua b/colors/base16-bespin.lua index ef02b36..3c016d1 100644 --- a/colors/base16-bespin.lua +++ b/colors/base16-bespin.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-bathory.lua b/colors/base16-black-metal-bathory.lua index 14092d1..0ebf832 100644 --- a/colors/base16-black-metal-bathory.lua +++ b/colors/base16-black-metal-bathory.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-burzum.lua b/colors/base16-black-metal-burzum.lua index 80ddd70..74573bc 100644 --- a/colors/base16-black-metal-burzum.lua +++ b/colors/base16-black-metal-burzum.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-dark-funeral.lua b/colors/base16-black-metal-dark-funeral.lua index 0f32de7..2ab6469 100644 --- a/colors/base16-black-metal-dark-funeral.lua +++ b/colors/base16-black-metal-dark-funeral.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-gorgoroth.lua b/colors/base16-black-metal-gorgoroth.lua index e4bdcc6..a8259ad 100644 --- a/colors/base16-black-metal-gorgoroth.lua +++ b/colors/base16-black-metal-gorgoroth.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-immortal.lua b/colors/base16-black-metal-immortal.lua index 6811fde..31177f8 100644 --- a/colors/base16-black-metal-immortal.lua +++ b/colors/base16-black-metal-immortal.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-khold.lua b/colors/base16-black-metal-khold.lua index 94f003f..7caf965 100644 --- a/colors/base16-black-metal-khold.lua +++ b/colors/base16-black-metal-khold.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-marduk.lua b/colors/base16-black-metal-marduk.lua index 04adacc..3491baa 100644 --- a/colors/base16-black-metal-marduk.lua +++ b/colors/base16-black-metal-marduk.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-mayhem.lua b/colors/base16-black-metal-mayhem.lua index f65adf1..327a208 100644 --- a/colors/base16-black-metal-mayhem.lua +++ b/colors/base16-black-metal-mayhem.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-nile.lua b/colors/base16-black-metal-nile.lua index 322fac7..55a8ac7 100644 --- a/colors/base16-black-metal-nile.lua +++ b/colors/base16-black-metal-nile.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal-venom.lua b/colors/base16-black-metal-venom.lua index 0f23c90..ef9fd35 100644 --- a/colors/base16-black-metal-venom.lua +++ b/colors/base16-black-metal-venom.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-black-metal.lua b/colors/base16-black-metal.lua index 64ac1dd..ae0f9b4 100644 --- a/colors/base16-black-metal.lua +++ b/colors/base16-black-metal.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-brewer.lua b/colors/base16-brewer.lua index ac34828..226df14 100644 --- a/colors/base16-brewer.lua +++ b/colors/base16-brewer.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-bright.lua b/colors/base16-bright.lua index 9446ae4..5d844a5 100644 --- a/colors/base16-bright.lua +++ b/colors/base16-bright.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-brogrammer.lua b/colors/base16-brogrammer.lua index c803eed..4f132fb 100644 --- a/colors/base16-brogrammer.lua +++ b/colors/base16-brogrammer.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-brushtrees-dark.lua b/colors/base16-brushtrees-dark.lua index 2476d02..a899953 100644 --- a/colors/base16-brushtrees-dark.lua +++ b/colors/base16-brushtrees-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-brushtrees.lua b/colors/base16-brushtrees.lua index 35d096d..c2338ae 100644 --- a/colors/base16-brushtrees.lua +++ b/colors/base16-brushtrees.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-chalk.lua b/colors/base16-chalk.lua index 1adc008..69d917e 100644 --- a/colors/base16-chalk.lua +++ b/colors/base16-chalk.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-circus.lua b/colors/base16-circus.lua index 1e6bcf2..e02bc6b 100644 --- a/colors/base16-circus.lua +++ b/colors/base16-circus.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-classic-dark.lua b/colors/base16-classic-dark.lua index e743318..19cf39e 100644 --- a/colors/base16-classic-dark.lua +++ b/colors/base16-classic-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-classic-light.lua b/colors/base16-classic-light.lua index 43298e3..489e5a5 100644 --- a/colors/base16-classic-light.lua +++ b/colors/base16-classic-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-codeschool.lua b/colors/base16-codeschool.lua index 330eafa..64e8a78 100644 --- a/colors/base16-codeschool.lua +++ b/colors/base16-codeschool.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-colors.lua b/colors/base16-colors.lua index c3a2766..5f2494c 100644 --- a/colors/base16-colors.lua +++ b/colors/base16-colors.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-cupcake.lua b/colors/base16-cupcake.lua index ab5e6d7..1764b15 100644 --- a/colors/base16-cupcake.lua +++ b/colors/base16-cupcake.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-cupertino.lua b/colors/base16-cupertino.lua index 844ab31..1d2be97 100644 --- a/colors/base16-cupertino.lua +++ b/colors/base16-cupertino.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-danqing-light.lua b/colors/base16-danqing-light.lua index b86bd7c..94095b9 100644 --- a/colors/base16-danqing-light.lua +++ b/colors/base16-danqing-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-danqing.lua b/colors/base16-danqing.lua index 883883a..3b064e8 100644 --- a/colors/base16-danqing.lua +++ b/colors/base16-danqing.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-darcula.lua b/colors/base16-darcula.lua index ffab9b5..176f0b8 100644 --- a/colors/base16-darcula.lua +++ b/colors/base16-darcula.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-darkmoss.lua b/colors/base16-darkmoss.lua index 78d80aa..48a9c2c 100644 --- a/colors/base16-darkmoss.lua +++ b/colors/base16-darkmoss.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-darktooth.lua b/colors/base16-darktooth.lua index bcbc36e..73a2dff 100644 --- a/colors/base16-darktooth.lua +++ b/colors/base16-darktooth.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-darkviolet.lua b/colors/base16-darkviolet.lua index 8047da5..2944fe4 100644 --- a/colors/base16-darkviolet.lua +++ b/colors/base16-darkviolet.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-decaf.lua b/colors/base16-decaf.lua index 904be2a..f1415c4 100644 --- a/colors/base16-decaf.lua +++ b/colors/base16-decaf.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-default-dark.lua b/colors/base16-default-dark.lua index a7a915c..b6c056e 100644 --- a/colors/base16-default-dark.lua +++ b/colors/base16-default-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-default-light.lua b/colors/base16-default-light.lua index 0990a2e..f1da803 100644 --- a/colors/base16-default-light.lua +++ b/colors/base16-default-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-dirtysea.lua b/colors/base16-dirtysea.lua index 28dc077..fa9ef36 100644 --- a/colors/base16-dirtysea.lua +++ b/colors/base16-dirtysea.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-dracula.lua b/colors/base16-dracula.lua index 6371dfd..cd56dbe 100644 --- a/colors/base16-dracula.lua +++ b/colors/base16-dracula.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-edge-dark.lua b/colors/base16-edge-dark.lua index e3a52d3..461420e 100644 --- a/colors/base16-edge-dark.lua +++ b/colors/base16-edge-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-edge-light.lua b/colors/base16-edge-light.lua index 6b31cec..ba60ed2 100644 --- a/colors/base16-edge-light.lua +++ b/colors/base16-edge-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-eighties.lua b/colors/base16-eighties.lua index cf41308..8661eab 100644 --- a/colors/base16-eighties.lua +++ b/colors/base16-eighties.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-embers.lua b/colors/base16-embers.lua index 364f540..11bd30f 100644 --- a/colors/base16-embers.lua +++ b/colors/base16-embers.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-equilibrium-dark.lua b/colors/base16-equilibrium-dark.lua index 6c19c08..7c27c2c 100644 --- a/colors/base16-equilibrium-dark.lua +++ b/colors/base16-equilibrium-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-equilibrium-gray-dark.lua b/colors/base16-equilibrium-gray-dark.lua index 3581f14..c8de73d 100644 --- a/colors/base16-equilibrium-gray-dark.lua +++ b/colors/base16-equilibrium-gray-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-equilibrium-gray-light.lua b/colors/base16-equilibrium-gray-light.lua index ac8e4a4..d700e0d 100644 --- a/colors/base16-equilibrium-gray-light.lua +++ b/colors/base16-equilibrium-gray-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-equilibrium-light.lua b/colors/base16-equilibrium-light.lua index 9901f64..a6c5157 100644 --- a/colors/base16-equilibrium-light.lua +++ b/colors/base16-equilibrium-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-espresso.lua b/colors/base16-espresso.lua index f553582..a689bc8 100644 --- a/colors/base16-espresso.lua +++ b/colors/base16-espresso.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-eva-dim.lua b/colors/base16-eva-dim.lua index dc53873..b162cf5 100644 --- a/colors/base16-eva-dim.lua +++ b/colors/base16-eva-dim.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-eva.lua b/colors/base16-eva.lua index d8f4d7b..d9b28a3 100644 --- a/colors/base16-eva.lua +++ b/colors/base16-eva.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-flat.lua b/colors/base16-flat.lua index 7ca8f0b..8a6dcc0 100644 --- a/colors/base16-flat.lua +++ b/colors/base16-flat.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-framer.lua b/colors/base16-framer.lua index 2328b19..fdac83a 100644 --- a/colors/base16-framer.lua +++ b/colors/base16-framer.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-fruit-soda.lua b/colors/base16-fruit-soda.lua index a470ec6..9db6e87 100644 --- a/colors/base16-fruit-soda.lua +++ b/colors/base16-fruit-soda.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gigavolt.lua b/colors/base16-gigavolt.lua index bd32464..af39239 100644 --- a/colors/base16-gigavolt.lua +++ b/colors/base16-gigavolt.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-github.lua b/colors/base16-github.lua index d4b596c..7187229 100644 --- a/colors/base16-github.lua +++ b/colors/base16-github.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-google-dark.lua b/colors/base16-google-dark.lua index 27adf30..87c63f8 100644 --- a/colors/base16-google-dark.lua +++ b/colors/base16-google-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-google-light.lua b/colors/base16-google-light.lua index 8496403..795ad0b 100644 --- a/colors/base16-google-light.lua +++ b/colors/base16-google-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-grayscale-dark.lua b/colors/base16-grayscale-dark.lua index b480e25..d6735ec 100644 --- a/colors/base16-grayscale-dark.lua +++ b/colors/base16-grayscale-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-grayscale-light.lua b/colors/base16-grayscale-light.lua index 3855bb7..87ad86b 100644 --- a/colors/base16-grayscale-light.lua +++ b/colors/base16-grayscale-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-greenscreen.lua b/colors/base16-greenscreen.lua index f64bdc4..c538edf 100644 --- a/colors/base16-greenscreen.lua +++ b/colors/base16-greenscreen.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruber.lua b/colors/base16-gruber.lua index d2a6865..82822d0 100644 --- a/colors/base16-gruber.lua +++ b/colors/base16-gruber.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruvbox-dark-hard.lua b/colors/base16-gruvbox-dark-hard.lua index 1237197..910cccb 100644 --- a/colors/base16-gruvbox-dark-hard.lua +++ b/colors/base16-gruvbox-dark-hard.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruvbox-dark-medium.lua b/colors/base16-gruvbox-dark-medium.lua index 85b1450..c909d57 100644 --- a/colors/base16-gruvbox-dark-medium.lua +++ b/colors/base16-gruvbox-dark-medium.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruvbox-dark-pale.lua b/colors/base16-gruvbox-dark-pale.lua index e8cbd8a..b50a817 100644 --- a/colors/base16-gruvbox-dark-pale.lua +++ b/colors/base16-gruvbox-dark-pale.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruvbox-dark-soft.lua b/colors/base16-gruvbox-dark-soft.lua index fce7a25..bb11a35 100644 --- a/colors/base16-gruvbox-dark-soft.lua +++ b/colors/base16-gruvbox-dark-soft.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruvbox-light-hard.lua b/colors/base16-gruvbox-light-hard.lua index a843c87..55183cc 100644 --- a/colors/base16-gruvbox-light-hard.lua +++ b/colors/base16-gruvbox-light-hard.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruvbox-light-medium.lua b/colors/base16-gruvbox-light-medium.lua index 42835f1..61886c3 100644 --- a/colors/base16-gruvbox-light-medium.lua +++ b/colors/base16-gruvbox-light-medium.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-gruvbox-light-soft.lua b/colors/base16-gruvbox-light-soft.lua index 2e43c16..7f123a3 100644 --- a/colors/base16-gruvbox-light-soft.lua +++ b/colors/base16-gruvbox-light-soft.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-hardcore.lua b/colors/base16-hardcore.lua index 4f9f715..79b7ec3 100644 --- a/colors/base16-hardcore.lua +++ b/colors/base16-hardcore.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-harmonic-dark.lua b/colors/base16-harmonic-dark.lua index c55107a..8c65b52 100644 --- a/colors/base16-harmonic-dark.lua +++ b/colors/base16-harmonic-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-harmonic-light.lua b/colors/base16-harmonic-light.lua index aa7fbc9..44131a3 100644 --- a/colors/base16-harmonic-light.lua +++ b/colors/base16-harmonic-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-heetch-light.lua b/colors/base16-heetch-light.lua index 5baa248..78687b4 100644 --- a/colors/base16-heetch-light.lua +++ b/colors/base16-heetch-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-heetch.lua b/colors/base16-heetch.lua index a41b502..200e335 100644 --- a/colors/base16-heetch.lua +++ b/colors/base16-heetch.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-helios.lua b/colors/base16-helios.lua index 63dfa5e..3aea139 100644 --- a/colors/base16-helios.lua +++ b/colors/base16-helios.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-hopscotch.lua b/colors/base16-hopscotch.lua index e18df5d..fd891b2 100644 --- a/colors/base16-hopscotch.lua +++ b/colors/base16-hopscotch.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-horizon-dark.lua b/colors/base16-horizon-dark.lua index 2f5b8e0..b26fee9 100644 --- a/colors/base16-horizon-dark.lua +++ b/colors/base16-horizon-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-horizon-light.lua b/colors/base16-horizon-light.lua index 574f024..b7489b6 100644 --- a/colors/base16-horizon-light.lua +++ b/colors/base16-horizon-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-horizon-terminal-dark.lua b/colors/base16-horizon-terminal-dark.lua index a39939d..d5e487c 100644 --- a/colors/base16-horizon-terminal-dark.lua +++ b/colors/base16-horizon-terminal-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-horizon-terminal-light.lua b/colors/base16-horizon-terminal-light.lua index 2ed42ed..07ad6ea 100644 --- a/colors/base16-horizon-terminal-light.lua +++ b/colors/base16-horizon-terminal-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-humanoid-dark.lua b/colors/base16-humanoid-dark.lua index 93f6b27..7000b1e 100644 --- a/colors/base16-humanoid-dark.lua +++ b/colors/base16-humanoid-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-humanoid-light.lua b/colors/base16-humanoid-light.lua index ebd99ab..4644f6e 100644 --- a/colors/base16-humanoid-light.lua +++ b/colors/base16-humanoid-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-ia-dark.lua b/colors/base16-ia-dark.lua index 657cbdd..4b4c832 100644 --- a/colors/base16-ia-dark.lua +++ b/colors/base16-ia-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-ia-light.lua b/colors/base16-ia-light.lua index acdd844..d3e1f50 100644 --- a/colors/base16-ia-light.lua +++ b/colors/base16-ia-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-icy.lua b/colors/base16-icy.lua index eeaa7da..8c68dd8 100644 --- a/colors/base16-icy.lua +++ b/colors/base16-icy.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-irblack.lua b/colors/base16-irblack.lua index 8dcdf7d..f14d50c 100644 --- a/colors/base16-irblack.lua +++ b/colors/base16-irblack.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-isotope.lua b/colors/base16-isotope.lua index 17518af..d09efaf 100644 --- a/colors/base16-isotope.lua +++ b/colors/base16-isotope.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-kimber.lua b/colors/base16-kimber.lua index 6fa6fa9..b023b0b 100644 --- a/colors/base16-kimber.lua +++ b/colors/base16-kimber.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-macintosh.lua b/colors/base16-macintosh.lua index afa2f82..2a42a9c 100644 --- a/colors/base16-macintosh.lua +++ b/colors/base16-macintosh.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-marrakesh.lua b/colors/base16-marrakesh.lua index 5d72190..688a2d4 100644 --- a/colors/base16-marrakesh.lua +++ b/colors/base16-marrakesh.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-materia.lua b/colors/base16-materia.lua index 21f4d0f..44db2ec 100644 --- a/colors/base16-materia.lua +++ b/colors/base16-materia.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-material-darker.lua b/colors/base16-material-darker.lua index 93019f5..5aa4ca4 100644 --- a/colors/base16-material-darker.lua +++ b/colors/base16-material-darker.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-material-lighter.lua b/colors/base16-material-lighter.lua index 84e072f..153c852 100644 --- a/colors/base16-material-lighter.lua +++ b/colors/base16-material-lighter.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-material-palenight.lua b/colors/base16-material-palenight.lua index bab0b96..3740b00 100644 --- a/colors/base16-material-palenight.lua +++ b/colors/base16-material-palenight.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-material-vivid.lua b/colors/base16-material-vivid.lua index 0babbec..742f1ba 100644 --- a/colors/base16-material-vivid.lua +++ b/colors/base16-material-vivid.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-material.lua b/colors/base16-material.lua index 6b2b2c0..88293c7 100644 --- a/colors/base16-material.lua +++ b/colors/base16-material.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-mellow-purple.lua b/colors/base16-mellow-purple.lua index 734905e..56f19a7 100644 --- a/colors/base16-mellow-purple.lua +++ b/colors/base16-mellow-purple.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-mexico-light.lua b/colors/base16-mexico-light.lua index 5c985b2..b56064e 100644 --- a/colors/base16-mexico-light.lua +++ b/colors/base16-mexico-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-mocha.lua b/colors/base16-mocha.lua index 677089c..3ece638 100644 --- a/colors/base16-mocha.lua +++ b/colors/base16-mocha.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-monokai.lua b/colors/base16-monokai.lua index 8e51250..285846e 100644 --- a/colors/base16-monokai.lua +++ b/colors/base16-monokai.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-nebula.lua b/colors/base16-nebula.lua index 8f42aec..f209457 100644 --- a/colors/base16-nebula.lua +++ b/colors/base16-nebula.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-nord.lua b/colors/base16-nord.lua index 1ec9117..b3fdce1 100644 --- a/colors/base16-nord.lua +++ b/colors/base16-nord.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-nova.lua b/colors/base16-nova.lua index 3a07d36..8f7b389 100644 --- a/colors/base16-nova.lua +++ b/colors/base16-nova.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-ocean.lua b/colors/base16-ocean.lua index 4731332..0f8c55c 100644 --- a/colors/base16-ocean.lua +++ b/colors/base16-ocean.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-oceanicnext.lua b/colors/base16-oceanicnext.lua index 473d3a7..e4f5d6f 100644 --- a/colors/base16-oceanicnext.lua +++ b/colors/base16-oceanicnext.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-one-light.lua b/colors/base16-one-light.lua index 8f55e8c..f81f688 100644 --- a/colors/base16-one-light.lua +++ b/colors/base16-one-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-onedark.lua b/colors/base16-onedark.lua index a45861c..8e228a4 100644 --- a/colors/base16-onedark.lua +++ b/colors/base16-onedark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-outrun-dark.lua b/colors/base16-outrun-dark.lua index 53de214..0c448aa 100644 --- a/colors/base16-outrun-dark.lua +++ b/colors/base16-outrun-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-papercolor-dark.lua b/colors/base16-papercolor-dark.lua index da9e263..b16970b 100644 --- a/colors/base16-papercolor-dark.lua +++ b/colors/base16-papercolor-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-papercolor-light.lua b/colors/base16-papercolor-light.lua index 9a68df7..f290ee5 100644 --- a/colors/base16-papercolor-light.lua +++ b/colors/base16-papercolor-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-paraiso.lua b/colors/base16-paraiso.lua index e1e02b9..5ec2ec5 100644 --- a/colors/base16-paraiso.lua +++ b/colors/base16-paraiso.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-pasque.lua b/colors/base16-pasque.lua index bcd89dc..364cef7 100644 --- a/colors/base16-pasque.lua +++ b/colors/base16-pasque.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-phd.lua b/colors/base16-phd.lua index f818c28..0c8bc5a 100644 --- a/colors/base16-phd.lua +++ b/colors/base16-phd.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-pico.lua b/colors/base16-pico.lua index 4a3d15b..963442f 100644 --- a/colors/base16-pico.lua +++ b/colors/base16-pico.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-pinky.lua b/colors/base16-pinky.lua index 2d40be4..dd3d135 100644 --- a/colors/base16-pinky.lua +++ b/colors/base16-pinky.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-pop.lua b/colors/base16-pop.lua index 61ce492..9a682f0 100644 --- a/colors/base16-pop.lua +++ b/colors/base16-pop.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-porple.lua b/colors/base16-porple.lua index f57c186..c3c05c6 100644 --- a/colors/base16-porple.lua +++ b/colors/base16-porple.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-purpledream.lua b/colors/base16-purpledream.lua index af22f15..b8fe8cc 100644 --- a/colors/base16-purpledream.lua +++ b/colors/base16-purpledream.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-qualia.lua b/colors/base16-qualia.lua index 315a347..65cc89a 100644 --- a/colors/base16-qualia.lua +++ b/colors/base16-qualia.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-railscasts.lua b/colors/base16-railscasts.lua index e8689f1..e01e9a0 100644 --- a/colors/base16-railscasts.lua +++ b/colors/base16-railscasts.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-rebecca.lua b/colors/base16-rebecca.lua index bfb18fc..70c74d8 100644 --- a/colors/base16-rebecca.lua +++ b/colors/base16-rebecca.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-rose-pine-dawn.lua b/colors/base16-rose-pine-dawn.lua index e14c975..f72f3d1 100644 --- a/colors/base16-rose-pine-dawn.lua +++ b/colors/base16-rose-pine-dawn.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-rose-pine-moon.lua b/colors/base16-rose-pine-moon.lua index d0fc468..beb90dc 100644 --- a/colors/base16-rose-pine-moon.lua +++ b/colors/base16-rose-pine-moon.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-rose-pine.lua b/colors/base16-rose-pine.lua index 2f5d993..f14cad7 100644 --- a/colors/base16-rose-pine.lua +++ b/colors/base16-rose-pine.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-sagelight.lua b/colors/base16-sagelight.lua index 857ffe5..4061177 100644 --- a/colors/base16-sagelight.lua +++ b/colors/base16-sagelight.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-sakura.lua b/colors/base16-sakura.lua index c5fb662..4824c65 100644 --- a/colors/base16-sakura.lua +++ b/colors/base16-sakura.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-sandcastle.lua b/colors/base16-sandcastle.lua index aff3898..9752f81 100644 --- a/colors/base16-sandcastle.lua +++ b/colors/base16-sandcastle.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-seti.lua b/colors/base16-seti.lua index 689247f..b888c05 100644 --- a/colors/base16-seti.lua +++ b/colors/base16-seti.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-shades-of-purple.lua b/colors/base16-shades-of-purple.lua index db65534..3303874 100644 --- a/colors/base16-shades-of-purple.lua +++ b/colors/base16-shades-of-purple.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-shapeshifter.lua b/colors/base16-shapeshifter.lua index 536413f..020e0b8 100644 --- a/colors/base16-shapeshifter.lua +++ b/colors/base16-shapeshifter.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-silk-dark.lua b/colors/base16-silk-dark.lua index df65135..b6dc795 100644 --- a/colors/base16-silk-dark.lua +++ b/colors/base16-silk-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-silk-light.lua b/colors/base16-silk-light.lua index 92129ed..cc55db9 100644 --- a/colors/base16-silk-light.lua +++ b/colors/base16-silk-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-snazzy.lua b/colors/base16-snazzy.lua index 5bdf71b..e7b5d04 100644 --- a/colors/base16-snazzy.lua +++ b/colors/base16-snazzy.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-solarflare-light.lua b/colors/base16-solarflare-light.lua index f4a6ca6..dc9f505 100644 --- a/colors/base16-solarflare-light.lua +++ b/colors/base16-solarflare-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-solarflare.lua b/colors/base16-solarflare.lua index f0be16e..49e8691 100644 --- a/colors/base16-solarflare.lua +++ b/colors/base16-solarflare.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-solarized-dark.lua b/colors/base16-solarized-dark.lua index ff419ce..268a153 100644 --- a/colors/base16-solarized-dark.lua +++ b/colors/base16-solarized-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-solarized-light.lua b/colors/base16-solarized-light.lua index 33882e9..8d80c59 100644 --- a/colors/base16-solarized-light.lua +++ b/colors/base16-solarized-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-spacemacs.lua b/colors/base16-spacemacs.lua index c269bda..ce7c068 100644 --- a/colors/base16-spacemacs.lua +++ b/colors/base16-spacemacs.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-summercamp.lua b/colors/base16-summercamp.lua index 2c520e8..ff00579 100644 --- a/colors/base16-summercamp.lua +++ b/colors/base16-summercamp.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-summerfruit-dark.lua b/colors/base16-summerfruit-dark.lua index 430f4cb..c7f05d5 100644 --- a/colors/base16-summerfruit-dark.lua +++ b/colors/base16-summerfruit-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-summerfruit-light.lua b/colors/base16-summerfruit-light.lua index 6c685dc..beb7568 100644 --- a/colors/base16-summerfruit-light.lua +++ b/colors/base16-summerfruit-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-synth-midnight-dark.lua b/colors/base16-synth-midnight-dark.lua index 4f08b37..bbabf12 100644 --- a/colors/base16-synth-midnight-dark.lua +++ b/colors/base16-synth-midnight-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-synth-midnight-light.lua b/colors/base16-synth-midnight-light.lua index c3bee66..ec33481 100644 --- a/colors/base16-synth-midnight-light.lua +++ b/colors/base16-synth-midnight-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-tango.lua b/colors/base16-tango.lua index 34e4df1..c9ce027 100644 --- a/colors/base16-tango.lua +++ b/colors/base16-tango.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-tender.lua b/colors/base16-tender.lua index 21dda8c..1cd8e9a 100644 --- a/colors/base16-tender.lua +++ b/colors/base16-tender.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-tube.lua b/colors/base16-tube.lua index a4518da..2ce7481 100644 --- a/colors/base16-tube.lua +++ b/colors/base16-tube.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-twilight.lua b/colors/base16-twilight.lua index a61df22..a01211c 100644 --- a/colors/base16-twilight.lua +++ b/colors/base16-twilight.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-unikitty-dark.lua b/colors/base16-unikitty-dark.lua index 024b5ce..b5803ce 100644 --- a/colors/base16-unikitty-dark.lua +++ b/colors/base16-unikitty-dark.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-unikitty-light.lua b/colors/base16-unikitty-light.lua index cd78e8f..728c881 100644 --- a/colors/base16-unikitty-light.lua +++ b/colors/base16-unikitty-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-unikitty-reversible.lua b/colors/base16-unikitty-reversible.lua index 7bb297f..779532f 100644 --- a/colors/base16-unikitty-reversible.lua +++ b/colors/base16-unikitty-reversible.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-vice-alt.lua b/colors/base16-vice-alt.lua index b248944..d6b7697 100644 --- a/colors/base16-vice-alt.lua +++ b/colors/base16-vice-alt.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-vice.lua b/colors/base16-vice.lua index d9af531..753aa63 100644 --- a/colors/base16-vice.lua +++ b/colors/base16-vice.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-vulcan.lua b/colors/base16-vulcan.lua index 295ccbf..0b9bd3b 100644 --- a/colors/base16-vulcan.lua +++ b/colors/base16-vulcan.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-10-light.lua b/colors/base16-windows-10-light.lua index 2046e8b..6bd4905 100644 --- a/colors/base16-windows-10-light.lua +++ b/colors/base16-windows-10-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-10.lua b/colors/base16-windows-10.lua index bd74ad1..d290769 100644 --- a/colors/base16-windows-10.lua +++ b/colors/base16-windows-10.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-95-light.lua b/colors/base16-windows-95-light.lua index 4e1d45c..571ca69 100644 --- a/colors/base16-windows-95-light.lua +++ b/colors/base16-windows-95-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-95.lua b/colors/base16-windows-95.lua index 06df97b..6070e0e 100644 --- a/colors/base16-windows-95.lua +++ b/colors/base16-windows-95.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-highcontrast-light.lua b/colors/base16-windows-highcontrast-light.lua index 8586469..424d101 100644 --- a/colors/base16-windows-highcontrast-light.lua +++ b/colors/base16-windows-highcontrast-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-highcontrast.lua b/colors/base16-windows-highcontrast.lua index 93f2725..a9afbc4 100644 --- a/colors/base16-windows-highcontrast.lua +++ b/colors/base16-windows-highcontrast.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-nt-light.lua b/colors/base16-windows-nt-light.lua index a0b0af6..495c054 100644 --- a/colors/base16-windows-nt-light.lua +++ b/colors/base16-windows-nt-light.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-windows-nt.lua b/colors/base16-windows-nt.lua index 824ed56..4979b94 100644 --- a/colors/base16-windows-nt.lua +++ b/colors/base16-windows-nt.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-woodland.lua b/colors/base16-woodland.lua index a2179d4..9d55107 100644 --- a/colors/base16-woodland.lua +++ b/colors/base16-woodland.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-xcode-dusk.lua b/colors/base16-xcode-dusk.lua index 0618fc1..2fd4a54 100644 --- a/colors/base16-xcode-dusk.lua +++ b/colors/base16-xcode-dusk.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/colors/base16-zenburn.lua b/colors/base16-zenburn.lua index bea4a35..2cbc08c 100644 --- a/colors/base16-zenburn.lua +++ b/colors/base16-zenburn.lua @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end diff --git a/templates/default.mustache b/templates/default.mustache index 3de56b8..315ace5 100644 --- a/templates/default.mustache +++ b/templates/default.mustache @@ -51,10 +51,15 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) local command = "" - if guifg ~= "" then + -- See `:help highlight-guifg`. + if guifg == "NONE" or guifg == "bg" or guifg == "background" or guifg == "fg" or guifg == "foreground" then + command = command .. " guifg=" .. guifg + elseif guifg ~= "" then command = command .. " guifg=#" .. guifg end - if guibg ~= "" then + if guibg == "NONE" or guibg == "bg" or guibg == "background" or guibg == "fg" or guibg == "foreground" then + command = command .. " guibg=" .. guibg + elseif guibg ~= "" then command = command .. " guibg=#" .. guibg end if ctermfg ~= "" then @@ -66,7 +71,9 @@ local highlight = function(group, guifg, guibg, ctermfg, ctermbg, attr, guisp) if attr ~= "" then command = command .. " gui=" .. attr .. " cterm=" .. attr end - if guisp ~= "" then + if guisp == "NONE" or guisp == "bg" or guisp == "background" or guisp == "fg" or guisp == "foreground" then + command = command .. " guisp=" .. guisp + elseif guisp ~= "" then command = command .. " guisp=#" .. guisp end