From bfa2dc40407999a9e6ab4e2c87f5da2f908771db Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Mon, 3 Jun 2019 15:55:18 +0100 Subject: [PATCH] Update jellybeans.vim to v1.6 --- pack/acp/start/jellybeans.vim/README.markdown | 7 ------- pack/acp/start/jellybeans.vim/colors/jellybeans.vim | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pack/acp/start/jellybeans.vim/README.markdown b/pack/acp/start/jellybeans.vim/README.markdown index 55067fc..da3fd7c 100644 --- a/pack/acp/start/jellybeans.vim/README.markdown +++ b/pack/acp/start/jellybeans.vim/README.markdown @@ -99,12 +99,6 @@ change the default colors. ![][preview-ss] -The font in the screenshot is 10pt [Monaco][monaco]: - -```vim -set guifont=Monaco:h10 noanti -``` - [ir_black]: https://web.archive.org/web/20140211124943/http://toddwerth.com/2008/01/25/a-black-os-x-leopard-terminal-theme-that-is-actually-readable/ [twilight]: http://www.vim.org/scripts/script.php?script_id=1677 @@ -113,4 +107,3 @@ set guifont=Monaco:h10 noanti [tc-snowleopard]: https://github.com/timmfin/terminalcolours [preview-ss]: https://nanotech.nanotechcorp.net/downloads/jellybeans-preview.png [ss-anchor]: #screenshots -[monaco]: https://en.wikipedia.org/wiki/Monaco_(typeface) diff --git a/pack/acp/start/jellybeans.vim/colors/jellybeans.vim b/pack/acp/start/jellybeans.vim/colors/jellybeans.vim index 6c2bc47..651194d 100644 --- a/pack/acp/start/jellybeans.vim/colors/jellybeans.vim +++ b/pack/acp/start/jellybeans.vim/colors/jellybeans.vim @@ -65,7 +65,7 @@ endif let colors_name = "jellybeans" -if has("gui_running") || (has('termguicolors') && &termguicolors) || &t_Co >= 88 +if has("gui_running") || &t_Co == 88 || &t_Co == 256 let s:low_color = 0 else let s:low_color = 1 @@ -274,7 +274,7 @@ endfun fun! s:color(r, g, b) " map greys directly (see xterm's 256colres.pl) if &t_Co == 256 && a:r == a:g && a:g == a:b && a:r > 3 && a:r < 243 - return (a:r - 8) / 10 + 232 + return float2nr(round(a:r - 8) / 10.0) + 232 endif " get the closest grey