aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-07-03 13:52:15 +1200
committerTom Ryder <tom@sanctum.geek.nz>2018-07-03 13:52:15 +1200
commiteed53f3305af0a1e059d0fbd79a3c85b17894eec (patch)
treed5028417b5354e9f9a97b5695251397da834d845
parent8ecf9dfad5e56b6d67f955d363a5a07ac69bfbc1 (diff)
downloaddotfiles-eed53f3305af0a1e059d0fbd79a3c85b17894eec.tar.gz
Handle system-specific undos with system.vim file
-rw-r--r--Makefile10
-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
4 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e864a7ad..9f5c768e 100644
--- a/Makefile
+++ b/Makefile
@@ -548,14 +548,12 @@ install-vim-compiler:
cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler
install-vim-config:
- mkdir -p -- $(VIMDIR)/config
cp -p -- vim/vimrc $(VIMRC)
if [ -e /etc/debian_version ] ; then \
- cp -p -- vim/config/debian.vim $(VIMDIR)/config ; \
- fi
- if [ -e /etc/centos-release ] ; then \
- cp -p -- vim/config/centos.vim $(VIMDIR)/config ; \
- fi
+ cp -p -- vim/system/debian.vim $(VIMDIR)/system.vim ; \
+ elif [ -e /etc/centos-release ] ; then \
+ cp -p -- vim/system/centos.vim $(VIMDIR)/system.vim ; \
+ fi
install-vim-filetype:
cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
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 = '_'