aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-08-21 15:44:19 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-08-21 15:44:19 +1200
commitf1a7a84a26914e7f716cdbbadfaea8c6ded95ec9 (patch)
tree85107862d375db8680116619d793e115946dd79c
parent8802414345b8f6656f6455431b8a56aa40db0ee0 (diff)
parentffd14f91f077ac2163c2053ad5a84065fbc9f3a1 (diff)
downloaddotfiles-1.57.0.tar.gz (sig)
dotfiles-1.57.0.zip
Merge branch 'release/v1.57.0'v1.57.0
* release/v1.57.0: Bump VERSION Update sahara.vim colorscheme to v0.3.0 Remove unwanted 'indentkeys' for Vim filetype
-rw-r--r--VERSION4
-rw-r--r--vim/after/indent/vim.vim7
m---------vim/bundle/sahara0
3 files changed, 9 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 487f6508..552d340e 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.56.0
-Tue Aug 21 02:14:41 UTC 2018
+tejr dotfiles v1.57.0
+Tue Aug 21 03:44:19 UTC 2018
diff --git a/vim/after/indent/vim.vim b/vim/after/indent/vim.vim
index ed1b8ebb..7e36c4cc 100644
--- a/vim/after/indent/vim.vim
+++ b/vim/after/indent/vim.vim
@@ -6,6 +6,13 @@ else
setlocal softtabstop=2
endif
+" Remove inapplicable defaults from 'indentkeys'
+setlocal indentkeys-=0#
+setlocal indentkeys-=0{
+setlocal indentkeys-=0}
+setlocal indentkeys-=0)
+setlocal indentkeys-=:
+
" Commands to undo the above
if exists('b:undo_indent')
let b:undo_indent = b:undo_indent . '|setlocal shiftwidth<'
diff --git a/vim/bundle/sahara b/vim/bundle/sahara
-Subproject 5b24c60103d7ee056b88f1c0cc799d6479d75ec
+Subproject 1c98c61b4674b911dc5ae00cd99ceefc13176a5