aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-23 16:31:48 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-23 16:31:48 +1200
commit1b66c80a383db3cc0634a2d8f3bd759d73537ad7 (patch)
treed39856e7ebd082498da9a1942bf9f2af9fd9d07d
parent1695bdf2fc91732dd4987e46b579beda9d7f532a (diff)
parentb25c506c18f43492b8e43680c29861cfcf566390 (diff)
downloaddotfiles-1b66c80a383db3cc0634a2d8f3bd759d73537ad7.tar.gz
dotfiles-1b66c80a383db3cc0634a2d8f3bd759d73537ad7.zip
Merge branch 'release/v6.40.0'v6.40.0
* release/v6.40.0: Update write_mkpath.vim to v2.2.0 Remove :Fortunate call from startup Fix a couple of small comment typos
-rw-r--r--VERSION4
-rw-r--r--vim/autoload/fortune.vim17
m---------vim/bundle/write_mkpath0
-rw-r--r--vim/plugin/fortune.vim17
-rw-r--r--vim/vimrc8
5 files changed, 7 insertions, 39 deletions
diff --git a/VERSION b/VERSION
index 920a1be8..133bccc7 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.39.0
-Sat, 22 Jun 2019 13:30:39 +0000
+tejr dotfiles v6.40.0
+Sun, 23 Jun 2019 04:31:46 +0000
diff --git a/vim/autoload/fortune.vim b/vim/autoload/fortune.vim
index 339b1aef..6bbe6b3b 100644
--- a/vim/autoload/fortune.vim
+++ b/vim/autoload/fortune.vim
@@ -8,19 +8,6 @@ let s:executables = [
\ 'timeout',
\]
-function! s:Highlight() abort
- highlight Fortune
- \ term=NONE
- \ cterm=NONE ctermfg=244 ctermbg=NONE
- \ gui=NONE guifg=#585858 guibg=NONE
-endfunction
-augroup fortune
- autocmd!
- autocmd ColorScheme *
- \ call s:Highlight()
-augroup END
-doautocmd fortune ColorScheme
-
function! fortune#() abort
for executable in s:executables
@@ -54,8 +41,6 @@ function! fortune#() abort
\ 'g',
\)
- echohl Fortune
- echo fortune
- echohl None
+ echomsg fortune
endfunction
diff --git a/vim/bundle/write_mkpath b/vim/bundle/write_mkpath
-Subproject 9f12c7a85e4a2f1cd6f6ba39c5a55a45fe4ea79
+Subproject 2e8372a1c589ccd03207010c7777e155f2f7823
diff --git a/vim/plugin/fortune.vim b/vim/plugin/fortune.vim
index b1c4955f..efc03467 100644
--- a/vim/plugin/fortune.vim
+++ b/vim/plugin/fortune.vim
@@ -1,21 +1,4 @@
command! -bar Fortune
\ call fortune#()
-
nnoremap <silent> <Plug>(Fortune)
\ :<C-U>Fortune<CR>
-
-function! s:FortuneVimEnter() abort
- if !argc() && line2byte('$') == -1
- try
- Fortune
- catch
- " Do nothing
- endtry
- endif
-endfunction
-
-augroup fortune
- autocmd!
- autocmd VimEnter *
- \ call s:FortuneVimEnter()
-augroup END
diff --git a/vim/vimrc b/vim/vimrc
index bfcfdd52..d8c40e38 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1041,10 +1041,10 @@ endif
" background. For any other color scheme, turn the option off, because it
" almost always stands out too much for my liking.
"
-" You'd think the autocommand pattern here could be used to match the colour
-" scheme name, and it can be ... after patch v7.4.108, when Christian Brabandt
-" fixed it. Until that version, it matched against the current buffer name,
-" so we're forced to have an explicit test in the command instead.
+" You'd think the pattern here could be used to match the color scheme name,
+" and it can be...after patch v7.4.108, when Christian Brabandt fixed it.
+" Until that version, it matched against the current buffer name, so we're
+" forced to have an explicit test in the command instead.
"
" <https://github.com/vim/vim/releases/tag/v7.4.108>
"