aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-03 13:55:24 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-03 13:55:24 +1200
commit7771beeedf282be83389e671a053e4c371d90fe4 (patch)
treea4acf68878770f558b257796b344b9a6a62aabf8 /vim
parentMerge branch 'release/v1.18.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-7771beeedf282be83389e671a053e4c371d90fe4.tar.gz
dotfiles-7771beeedf282be83389e671a053e4c371d90fe4.zip
Merge branch 'release/v1.19.0'v1.19.0
* release/v1.19.0: Bump VERSION Convert space indents to tabs in Makefile Handle system-specific undos with system.vim file
Diffstat (limited to 'vim')
-rw-r--r--vim/system/centos.vim (renamed from vim/config/centos.vim)0
-rw-r--r--vim/system/debian.vim (renamed from vim/config/debian.vim)0
-rw-r--r--vim/vimrc3
3 files changed, 3 insertions, 0 deletions
diff --git a/vim/config/centos.vim b/vim/system/centos.vim
index 26289bf8..26289bf8 100644
--- a/vim/config/centos.vim
+++ b/vim/system/centos.vim
diff --git a/vim/config/debian.vim b/vim/system/debian.vim
index 125a9240..125a9240 100644
--- a/vim/config/debian.vim
+++ b/vim/system/debian.vim
diff --git a/vim/vimrc b/vim/vimrc
index 5f3e06cf..b1fbbbd4 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -4,6 +4,9 @@
" own without the accompanying plugins to which it refers near its end, but
" you'll get errors for some of the leader maps.
+" Undo anything the operating system's vimrc may have broken
+runtime system.vim
+
" Load filetype settings, plugins, and maps
if has('autocmd')
let g:maplocalleader = '_'