aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-06-25 11:54:36 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-06-25 11:54:36 +1200
commit2d96baf13db2a4b29a82180462e43858c963f3e2 (patch)
treed35dec279d2468da5199177ea68aadfccd704177
parentd025b8101b300c34e0e74d54ec821b69ee08cc94 (diff)
parent9c7b138e39f2ec527ea349855f251261239ed1eb (diff)
downloaddotfiles-2d96baf13db2a4b29a82180462e43858c963f3e2.tar.gz
dotfiles-2d96baf13db2a4b29a82180462e43858c963f3e2.zip
Merge branch 'release/v1.2.0'v1.2.0
* release/v1.2.0: Bump VERSION Clear away filetype buffer mappings in vimrc
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc3
2 files changed, 5 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 8e413b2c..04945fbb 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v1.1.0
-Sun Jun 24 21:02:03 UTC 2018
+tejr dotfiles v1.2.0
+Sun Jun 24 23:54:16 UTC 2018
diff --git a/vim/vimrc b/vim/vimrc
index 13211067..a6a3beae 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -277,6 +277,9 @@ if has('autocmd') && v:version >= 700
augroup vimrc_filetype_mappings
autocmd!
+ " Clear away existing local mappings
+ autocmd FileType * mapclear <buffer>
+
" Diff: prune sections
autocmd FileType diff nmap <buffer> _p <Plug>DiffPrune
autocmd FileType diff xmap <buffer> _p <Plug>DiffPrune