aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-12 22:07:39 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-12 22:07:39 +1200
commit8323dbdf27870a0845987cfacb49950b23dbbee4 (patch)
tree3e5c992449c783103b53ab5449d2ffb5881ad094
parent485c5477f5cb83c07b0ccc1c198d0a7810c70aa2 (diff)
parent9eac8266476cf1c09d2e518de00e41188677ff02 (diff)
downloadvim-sahara-8323dbdf27870a0845987cfacb49950b23dbbee4.tar.gz
Merge branch 'release/v1.0.0'v1.0.0
* release/v1.0.0: Raise explicit error on insufficient color depth Pare down two blank lines in a comment Remove unneeded variable scoping Switch to two-spacing
-rw-r--r--README.md4
-rw-r--r--VERSION2
-rw-r--r--colors/sahara.vim111
3 files changed, 59 insertions, 58 deletions
diff --git a/README.md b/README.md
index 46c865d..34a3907 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@ Sahara
======
Tweaked version of the [desert256][1] colorscheme for Vim, without the clunky
-color detection code. More subdued status bars, tab bars, and line numbers.
+color detection code. More subdued status bars, tab bars, and line numbers.
License
-------
-Copyright (c) [Tom Ryder][2]. Distributed under the same terms as Vim itself.
+Copyright (c) [Tom Ryder][2]. Distributed under the same terms as Vim itself.
See `:help license`.
[1]: http://www.vim.org/scripts/script.php?script_id=1243
diff --git a/VERSION b/VERSION
index 1d0ba9e..3eefcb9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.0
+1.0.0
diff --git a/colors/sahara.vim b/colors/sahara.vim
index b637583..8fab6dc 100644
--- a/colors/sahara.vim
+++ b/colors/sahara.vim
@@ -1,6 +1,6 @@
"
" sahara, a 256-color retake on desert256 with the color detection code
-" removed for clarity. Written by Tom Ryder (tejr).
+" removed for clarity. Written by Tom Ryder (tejr).
"
" <http://vim.wikia.com/wiki/Xterm256_color_names_for_console_Vim>
" <https://sanctum.geek.nz/arabesque/sahara-vim-colorscheme/>
@@ -11,64 +11,65 @@
set background=dark
if v:version > 580
highlight clear
- if exists('g:syntax_on')
+ if exists('syntax_on')
syntax reset
endif
endif
-let g:colors_name = 'sahara'
-" Highlighting definitions
-if has('gui_running') || &t_Co == 256
+" Do nothing if we can't get our colors
+if !has('gui_running') && &t_Co < 256
+ echoerr 'Colorscheme requires GUI or 256 color term'
+ finish
+endif
- " Actual colours and styles
- highlight Comment term=NONE cterm=NONE ctermfg=110 ctermbg=NONE gui=NONE guifg=#87afd7 guibg=NONE
- highlight Constant term=NONE cterm=NONE ctermfg=217 ctermbg=NONE gui=NONE guifg=#ffafaf guibg=NONE
- highlight Cursor term=NONE cterm=NONE ctermfg=66 ctermbg=222 gui=NONE guifg=#5f8787 guibg=#ffd787
- highlight CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212
- highlight DiffAdd term=NONE cterm=NONE ctermfg=NONE ctermbg=22 gui=NONE guifg=NONE guibg=#005f00
- highlight DiffChange term=NONE cterm=NONE ctermfg=NONE ctermbg=17 gui=NONE guifg=NONE guibg=#00005f
- highlight DiffDelete term=NONE cterm=NONE ctermfg=NONE ctermbg=52 gui=NONE guifg=NONE guibg=#5f0000
- highlight DiffText term=NONE cterm=NONE ctermfg=NONE ctermbg=19 gui=NONE guifg=NONE guibg=#0000af
- highlight FoldColumn term=NONE cterm=NONE ctermfg=180 ctermbg=237 gui=NONE guifg=#d7af87 guibg=#3a3a3a
- highlight Folded term=NONE cterm=NONE ctermfg=220 ctermbg=237 gui=NONE guifg=#ffd700 guibg=#3a3a3a
- highlight Identifier term=NONE cterm=NONE ctermfg=120 ctermbg=NONE gui=NONE guifg=#87ff87 guibg=NONE
- highlight Ignore term=NONE cterm=NONE ctermfg=240 ctermbg=NONE gui=NONE guifg=#585858 guibg=NONE
- highlight IncSearch term=NONE cterm=NONE ctermfg=147 ctermbg=24 gui=NONE guifg=#afafff guibg=#005f87
- highlight ModeMsg term=NONE cterm=NONE ctermfg=178 ctermbg=NONE gui=NONE guifg=#d7af00 guibg=NONE
- highlight MoreMsg term=NONE cterm=NONE ctermfg=29 ctermbg=NONE gui=NONE guifg=#00875f guibg=NONE
- highlight NonText term=NONE cterm=NONE ctermfg=237 ctermbg=NONE gui=NONE guifg=#3a3a3a guibg=NONE
- highlight Normal term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=#c6c6c6 guibg=#030303
- highlight Pmenu term=NONE cterm=NONE ctermfg=231 ctermbg=237 gui=NONE guifg=#ffffff guibg=#3a3a3a
- highlight PreProc term=NONE cterm=NONE ctermfg=167 ctermbg=NONE gui=NONE guifg=#d75f5f guibg=NONE
- highlight Question term=NONE cterm=NONE ctermfg=48 ctermbg=NONE gui=NONE guifg=#00ff87 guibg=NONE
- highlight Search term=NONE cterm=NONE ctermfg=147 ctermbg=18 gui=NONE guifg=#afafff guibg=#000087
- highlight Special term=NONE cterm=NONE ctermfg=223 ctermbg=NONE gui=NONE guifg=#ffd7af guibg=NONE
- highlight SpecialKey term=NONE cterm=NONE ctermfg=112 ctermbg=NONE gui=NONE guifg=#87d700 guibg=NONE
- highlight SpellBad term=NONE cterm=NONE ctermfg=NONE ctermbg=52 gui=NONE guifg=NONE guibg=#303030
- highlight Statement term=NONE cterm=NONE ctermfg=222 ctermbg=NONE gui=NONE guifg=#ffd787 guibg=NONE
- highlight StatusLine term=NONE cterm=NONE ctermfg=231 ctermbg=237 gui=NONE guifg=#ffffff guibg=#3a3a3a
- highlight StatusLineNC term=NONE cterm=NONE ctermfg=16 ctermbg=237 gui=NONE guifg=#000000 guibg=#3a3a3a
- highlight Todo term=NONE cterm=NONE ctermfg=196 ctermbg=226 gui=NONE guifg=#ff0000 guibg=#ffff00
- highlight Type term=NONE cterm=NONE ctermfg=143 ctermbg=NONE gui=NONE guifg=#afaf5f guibg=NONE
- highlight Underlined term=NONE cterm=NONE ctermfg=81 ctermbg=NONE gui=NONE guifg=#5fd7ff guibg=NONE
- highlight VertSplit term=NONE cterm=NONE ctermfg=243 ctermbg=237 gui=NONE guifg=#767676 guibg=#3a3a3a
- highlight Visual term=NONE cterm=NONE ctermfg=222 ctermbg=64 gui=NONE guifg=#ffd787 guibg=#5f8700
- highlight WarningMsg term=NONE cterm=NONE ctermfg=209 ctermbg=NONE gui=NONE guifg=#ff875f guibg=NONE
+" Set colorscheme name
+let colors_name = 'sahara'
- "
- " General highlighting group links.
- "
- highlight! link Title Normal
- highlight! link LineNr NonText
- highlight! link CursorLineNr LineNr
- highlight! link TabLine StatusLineNC
- highlight! link TabLineFill StatusLineNC
- highlight! link TabLineSel StatusLine
- highlight! link VertSplit StatusLineNC
- highlight! link VimHiGroup VimGroup
- highlight! link SpellCap SpellBad
- highlight! link SpellLocal SpellBad
- highlight! link SpellRare SpellBad
- highlight! link CursorColumn CursorLine
+" Actual colours and styles
+highlight Comment term=NONE cterm=NONE ctermfg=110 ctermbg=NONE gui=NONE guifg=#87afd7 guibg=NONE
+highlight Constant term=NONE cterm=NONE ctermfg=217 ctermbg=NONE gui=NONE guifg=#ffafaf guibg=NONE
+highlight Cursor term=NONE cterm=NONE ctermfg=66 ctermbg=222 gui=NONE guifg=#5f8787 guibg=#ffd787
+highlight CursorLine term=NONE cterm=NONE ctermfg=NONE ctermbg=233 gui=NONE guifg=NONE guibg=#121212
+highlight DiffAdd term=NONE cterm=NONE ctermfg=NONE ctermbg=22 gui=NONE guifg=NONE guibg=#005f00
+highlight DiffChange term=NONE cterm=NONE ctermfg=NONE ctermbg=17 gui=NONE guifg=NONE guibg=#00005f
+highlight DiffDelete term=NONE cterm=NONE ctermfg=NONE ctermbg=52 gui=NONE guifg=NONE guibg=#5f0000
+highlight DiffText term=NONE cterm=NONE ctermfg=NONE ctermbg=19 gui=NONE guifg=NONE guibg=#0000af
+highlight FoldColumn term=NONE cterm=NONE ctermfg=180 ctermbg=237 gui=NONE guifg=#d7af87 guibg=#3a3a3a
+highlight Folded term=NONE cterm=NONE ctermfg=220 ctermbg=237 gui=NONE guifg=#ffd700 guibg=#3a3a3a
+highlight Identifier term=NONE cterm=NONE ctermfg=120 ctermbg=NONE gui=NONE guifg=#87ff87 guibg=NONE
+highlight Ignore term=NONE cterm=NONE ctermfg=240 ctermbg=NONE gui=NONE guifg=#585858 guibg=NONE
+highlight IncSearch term=NONE cterm=NONE ctermfg=147 ctermbg=24 gui=NONE guifg=#afafff guibg=#005f87
+highlight ModeMsg term=NONE cterm=NONE ctermfg=178 ctermbg=NONE gui=NONE guifg=#d7af00 guibg=NONE
+highlight MoreMsg term=NONE cterm=NONE ctermfg=29 ctermbg=NONE gui=NONE guifg=#00875f guibg=NONE
+highlight NonText term=NONE cterm=NONE ctermfg=237 ctermbg=NONE gui=NONE guifg=#3a3a3a guibg=NONE
+highlight Normal term=NONE cterm=NONE ctermfg=NONE ctermbg=NONE gui=NONE guifg=#c6c6c6 guibg=#030303
+highlight Pmenu term=NONE cterm=NONE ctermfg=231 ctermbg=237 gui=NONE guifg=#ffffff guibg=#3a3a3a
+highlight PreProc term=NONE cterm=NONE ctermfg=167 ctermbg=NONE gui=NONE guifg=#d75f5f guibg=NONE
+highlight Question term=NONE cterm=NONE ctermfg=48 ctermbg=NONE gui=NONE guifg=#00ff87 guibg=NONE
+highlight Search term=NONE cterm=NONE ctermfg=147 ctermbg=18 gui=NONE guifg=#afafff guibg=#000087
+highlight Special term=NONE cterm=NONE ctermfg=223 ctermbg=NONE gui=NONE guifg=#ffd7af guibg=NONE
+highlight SpecialKey term=NONE cterm=NONE ctermfg=112 ctermbg=NONE gui=NONE guifg=#87d700 guibg=NONE
+highlight SpellBad term=NONE cterm=NONE ctermfg=NONE ctermbg=52 gui=NONE guifg=NONE guibg=#303030
+highlight Statement term=NONE cterm=NONE ctermfg=222 ctermbg=NONE gui=NONE guifg=#ffd787 guibg=NONE
+highlight StatusLine term=NONE cterm=NONE ctermfg=231 ctermbg=237 gui=NONE guifg=#ffffff guibg=#3a3a3a
+highlight StatusLineNC term=NONE cterm=NONE ctermfg=16 ctermbg=237 gui=NONE guifg=#000000 guibg=#3a3a3a
+highlight Todo term=NONE cterm=NONE ctermfg=196 ctermbg=226 gui=NONE guifg=#ff0000 guibg=#ffff00
+highlight Type term=NONE cterm=NONE ctermfg=143 ctermbg=NONE gui=NONE guifg=#afaf5f guibg=NONE
+highlight Underlined term=NONE cterm=NONE ctermfg=81 ctermbg=NONE gui=NONE guifg=#5fd7ff guibg=NONE
+highlight VertSplit term=NONE cterm=NONE ctermfg=243 ctermbg=237 gui=NONE guifg=#767676 guibg=#3a3a3a
+highlight Visual term=NONE cterm=NONE ctermfg=222 ctermbg=64 gui=NONE guifg=#ffd787 guibg=#5f8700
+highlight WarningMsg term=NONE cterm=NONE ctermfg=209 ctermbg=NONE gui=NONE guifg=#ff875f guibg=NONE
-endif
+" General highlighting group links.
+highlight! link Title Normal
+highlight! link LineNr NonText
+highlight! link CursorLineNr LineNr
+highlight! link TabLine StatusLineNC
+highlight! link TabLineFill StatusLineNC
+highlight! link TabLineSel StatusLine
+highlight! link VertSplit StatusLineNC
+highlight! link VimHiGroup VimGroup
+highlight! link SpellCap SpellBad
+highlight! link SpellLocal SpellBad
+highlight! link SpellRare SpellBad
+highlight! link CursorColumn CursorLine