aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-17 09:03:50 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-17 09:03:50 +1200
commit584a0a0b3551c4629cfe5afdbf80c09b623d04ee (patch)
treec35e8003390c2b90d559cf7f17d1f0f6bd1651c6
parent4a6e1cc688c5c6aa3dff1489538cf3e88104dc9a (diff)
parent1a43e5e25562ea38e8015ad649def93cb9b539b1 (diff)
downloaddotfiles-master.tar.gz
Merge branch 'release/v6.23.0'HEADv6.23.0master
* release/v6.23.0: Correct existence check for Vim strftime() func Remove a now-inaccurate comment
-rw-r--r--VERSION4
-rw-r--r--vim/plugin/put_date.vim2
-rw-r--r--vim/vimrc12
3 files changed, 3 insertions, 15 deletions
diff --git a/VERSION b/VERSION
index e20571f6..439f4c34 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.22.0
-Sun, 16 Jun 2019 12:57:51 +0000
+tejr dotfiles v6.23.0
+Sun, 16 Jun 2019 21:03:48 +0000
diff --git a/vim/plugin/put_date.vim b/vim/plugin/put_date.vim
index e78f5fcd..7848e95f 100644
--- a/vim/plugin/put_date.vim
+++ b/vim/plugin/put_date.vim
@@ -1,4 +1,4 @@
-if exists('loaded_put_date') || &compatible || !has('*strftime')
+if exists('loaded_put_date') || &compatible || !exists('*strftime')
finish
endif
let loaded_put_date = 1
diff --git a/vim/vimrc b/vim/vimrc
index d9004081..0fc9d24b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1005,18 +1005,6 @@ autocmd vimrc ColorScheme *
autocmd vimrc ColorScheme sahara
\ set cursorline
-" We'll have Vim try to use my 'sahara' fork of the 'desert256' color scheme.
-" If we fail to load the color scheme, for whatever reason, suppress the
-" error, and default to a dark background (if not already) for the default
-" color scheme in the absence of guidance otherwise from a COLORFGBG
-" environment variable or a t_RB terminal response. Vim otherwise defaults to
-" 'light', which is less likely in my case.
-"
-" There's also a very simple grayscale color scheme I occasionally use instead
-" called 'juvenile', which is included as a Git submodule with this dotfiles
-" distribution.
-"
-
" Use 'dark' as my default value for 'background', in the absence of an
" environment variable COLORFGBG or a response in v:termrbgresp that would set
" it specifically.