From 68f676b65d776afec4acca520daef436f1e1f500 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Mon, 2 Jul 2018 14:30:20 +1200
Subject: Add vim config subfile to undo Debian's changes

---
 Makefile              |  1 +
 vim/config/debian.vim | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 vim/config/debian.vim

diff --git a/Makefile b/Makefile
index 4bb09b1a..b42ee72c 100644
--- a/Makefile
+++ b/Makefile
@@ -549,6 +549,7 @@ install-vim-compiler:
 
 install-vim-config:
 	cp -p -- vim/vimrc $(VIMRC)
+	cp -p -- vim/config/*.vim $(VIMDIR)/config
 
 install-vim-filetype:
 	cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR)
diff --git a/vim/config/debian.vim b/vim/config/debian.vim
new file mode 100644
index 00000000..e50fc260
--- /dev/null
+++ b/vim/config/debian.vim
@@ -0,0 +1,21 @@
+" Revert settings that Debian might have touched
+if $VIM ==# '/usr/share/vim' && filereadable('/etc/debian_version')
+
+  " Set options back to appropriate defaults
+  set history&
+  set suffixes&
+  if has('cmdline_info')
+    set ruler&
+  endif
+  if has('printoptions')
+    set printoptions&
+  endif
+
+  " Restore terminal settings to reflect terminfo
+  set t_Co& t_Sf& t_Sb&
+
+  " Remove addons directories from 'runtimepath' if present
+  silent! set runtimepath-=/var/lib/vim/addons
+  silent! set runtimepath-=/var/lib/vim/addons/after
+
+endif
-- 
cgit v1.2.3