aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-30 00:50:49 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-30 00:50:49 +1200
commit0524542b03d486d48c178b5abf5cb77f3351f487 (patch)
treef8d94551f7703a3c682d07c20ba94680b7812236
parentMerge branch 'release/v5.9.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-0524542b03d486d48c178b5abf5cb77f3351f487.tar.gz
dotfiles-0524542b03d486d48c178b5abf5cb77f3351f487.zip
Merge branch 'release/v5.10.0'v5.10.0
* release/v5.10.0: Add vim-write-mkpath v0.1.0 Explicitly set colorscheme if sahara fails Reload vimrc on save Get full path before testing for :CompilerSet Add check/lint for git-template-hooks to target
-rw-r--r--.gitmodules3
-rw-r--r--IDEAS.md3
-rw-r--r--Makefile2
-rw-r--r--VERSION4
-rw-r--r--vim/after/syntax/vim.vim2
m---------vim/bundle/write_mkpath0
-rw-r--r--vim/vimrc9
7 files changed, 17 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index 715d34b5..2526e82f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -71,6 +71,9 @@
[submodule "vim/bundle/vimrc_reload_filetype"]
path = vim/bundle/vimrc_reload_filetype
url = https://sanctum.geek.nz/code/vim-vimrc-reload-filetype.git
+[submodule "vim/bundle/write_mkpath"]
+ path = vim/bundle/write_mkpath
+ url = https://sanctum.geek.nz/code/vim-write-mkpath.git
# Vim filetype plugins
[submodule "vim/bundle/diff_prune"]
diff --git a/IDEAS.md b/IDEAS.md
index adbc1d59..fdfe7939 100644
--- a/IDEAS.md
+++ b/IDEAS.md
@@ -26,9 +26,6 @@ Ideas
appropriate `gawk --lint` calls for each of the .awk scripts.
* Alternate buffer type switching would probably work rather well as a simple
plugin.
-* Write my own take on a plugin that creates paths if they don't exist before
- saving a file. I already have \P, but it might be nice to automate it, maybe
- with a prompt for security raisins.
* Write a ftplugin for Perl to switch between punctuation variable names and
English variable names., i.e. \e on `$?` would change to `$CHILD_ERROR`, and
vice-versa.
diff --git a/Makefile b/Makefile
index a9f03e41..4340835e 100644
--- a/Makefile
+++ b/Makefile
@@ -657,6 +657,7 @@ install-zsh: check-zsh install-sh
cp -p -- zsh/zshrc.d/* $(HOME)/.zshrc.d
check: check-bin \
+ check-git-template-hooks \
check-login-shell \
check-man \
check-sh
@@ -697,6 +698,7 @@ check-zsh:
lint: lint-bash \
lint-bin \
lint-games \
+ lint-git-template-hooks \
lint-ksh \
lint-sh \
lint-urxvt \
diff --git a/VERSION b/VERSION
index b3bfc24a..e50cd32c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v5.9.0
-Wed May 29 07:22:03 UTC 2019
+tejr dotfiles v5.10.0
+Wed May 29 12:50:49 UTC 2019
diff --git a/vim/after/syntax/vim.vim b/vim/after/syntax/vim.vim
index cae5c815..e67803cc 100644
--- a/vim/after/syntax/vim.vim
+++ b/vim/after/syntax/vim.vim
@@ -3,7 +3,7 @@ syntax clear vimCommentString
" Highlight :CompilerSet commands like :set/:setlocal, but only in compiler
" scripts in recognisable paths
-if expand('%:h:t') ==# 'compiler'
+if expand('%:p:h:t') ==# 'compiler'
\ && expand('%:e') ==# 'vim'
syntax keyword vimCommand contained
\ CompilerSet
diff --git a/vim/bundle/write_mkpath b/vim/bundle/write_mkpath
new file mode 160000
+Subproject 53f1a5c423af025ea02ad3ee92099100994b8cb
diff --git a/vim/vimrc b/vim/vimrc
index fe3cb647..2852ee57 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -232,7 +232,9 @@ try
colorscheme sahara
set cursorline
catch
+ colorscheme default
set background=dark
+ set nocursorline
endtry
" Space bar scrolls down a page, :next if plugin available
@@ -460,3 +462,10 @@ nnoremap <Leader>! ^"zyg_:!<C-R>z<CR>
inoreabbrev almsot almost
inoreabbrev wrnog wrong
inoreabbrev Fielding Feilding
+
+" Reload this file when I save it, modified or nay
+augroup vimrc
+ autocmd!
+ autocmd BufWritePost $MYVIMRC,$MYVIM/vimrc
+ \ source $MYVIMRC
+augroup END