From 5722bc09c06bc9a3c6c8f0cd7c04b0ee801bc6e2 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Sun, 10 Oct 2021 19:26:05 +0800 Subject: [PATCH] simplify compat check --- colors/zenbones.vim | 6 +----- colors/zenflesh.vim | 6 +----- lua/zenbones/template/vim.lua | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/colors/zenbones.vim b/colors/zenbones.vim index b68aaad..a0c4f51 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -24,11 +24,7 @@ let g:terminal_color_13 = '#7B3B70' let g:terminal_color_14 = '#2B747C' let g:terminal_color_15 = '#4F5E68' -if !exists('g:zenbones_compat') - let g:zenbones_compat = !has('nvim') -endif -if g:zenbones_compat == 0 - let g:colors_name = 'zenbones' +if has('nvim') && (!exists('g:zenbones_compat') || g:zenbones_compat == 0) lua package.loaded["zenbones"] = nil lua require "lush"(require "zenbones", { force_clean = false }) finish diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index c525410..5a6d9cf 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -24,11 +24,7 @@ let g:terminal_color_13 = '#CF86C1' let g:terminal_color_14 = '#65B8C1' let g:terminal_color_15 = '#888F94' -if !exists('g:zenbones_compat') - let g:zenbones_compat = !has('nvim') -endif -if g:zenbones_compat == 0 - let g:colors_name = 'zenflesh' +if has('nvim') && (!exists('g:zenbones_compat') || g:zenbones_compat == 0) lua package.loaded["zenflesh"] = nil lua require "lush"(require "zenflesh", { force_clean = false }) finish diff --git a/lua/zenbones/template/vim.lua b/lua/zenbones/template/vim.lua index 30f5d57..e19c938 100644 --- a/lua/zenbones/template/vim.lua +++ b/lua/zenbones/template/vim.lua @@ -8,11 +8,7 @@ endif let g:colors_name = '${name}' ${termcolors} -if !exists('g:zenbones_compat') - let g:zenbones_compat = !has('nvim') -endif -if g:zenbones_compat == 0 - let g:colors_name = '${name}' +if has('nvim') && (!exists('g:zenbones_compat') || g:zenbones_compat == 0) lua package.loaded["${specs_path}"] = nil lua require "lush"(require "${specs_path}", { force_clean = false }) finish