aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-29 14:00:04 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-29 14:00:04 +1200
commitb2afabb4e064f68729f69356bf1c5e7fb3e94630 (patch)
treef49eed70649b21ad068c4513e46e5ba7a66df382
parent0b52490b2458b78db44eab29654fe449bcb5b5a3 (diff)
parenta2317c4451f00413a4d7e58a7c65d8ff63e5cf21 (diff)
downloadvim-sahara-b2afabb4e064f68729f69356bf1c5e7fb3e94630.tar.gz
Merge branch 'release/v1.4.0'HEADv1.4.0master
* release/v1.4.0: Adjust load guard
-rw-r--r--VERSION2
-rw-r--r--colors/sahara.vim15
2 files changed, 8 insertions, 9 deletions
diff --git a/VERSION b/VERSION
index f0bb29e..88c5fb8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.0
+1.4.0
diff --git a/colors/sahara.vim b/colors/sahara.vim
index 6bc44e6..aa59a98 100644
--- a/colors/sahara.vim
+++ b/colors/sahara.vim
@@ -7,19 +7,18 @@
" <https://sanctum.geek.nz/>
"
-" Do nothing if we can't get our colors
-if !has('gui_running') && &t_Co < 256
- echoerr 'Colorscheme requires GUI or 256 color term'
+" Do nothing if too old or we can't get our colors
+if v:version < 700
+ \ || !has('gui_running') && &t_Co < 256
+ echoerr 'Colorscheme requires Vim >=7.0 and GUI or 256 color term'
finish
endif
" Terminal setup
set background=dark
-if v:version > 580
- highlight clear
- if exists('syntax_on')
- syntax reset
- endif
+highlight clear
+if exists('syntax_on')
+ syntax reset
endif
" Set colorscheme name