aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-24 15:20:49 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-24 15:25:26 +1200
commit334f4135331df528cef4107cf56deaea04418751 (patch)
treee8af93b531f9874965ec90b1cfb4994840c5089d
parentTolerate spaces for final reply move (diff)
downloaddotfiles-334f4135331df528cef4107cf56deaea04418751.tar.gz
dotfiles-334f4135331df528cef4107cf56deaea04418751.zip
Remove per-system vimrc fixing
This is just overkill. Move the useful bits into the vimrc.
-rw-r--r--Makefile5
-rw-r--r--vim/system/centos.vim33
-rw-r--r--vim/system/debian.vim18
-rw-r--r--vim/vimrc15
4 files changed, 12 insertions, 59 deletions
diff --git a/Makefile b/Makefile
index 11364324..9468ff85 100644
--- a/Makefile
+++ b/Makefile
@@ -588,11 +588,6 @@ install-vim-compiler:
install-vim-config: install-vim-cache
cp -p -- vim/vimrc.stub.vim $(HOME)/.vimrc
cp -p -- vim/vimrc $(VIMRC)
- if [ -e /etc/debian_version ] ; then \
- 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/system/centos.vim b/vim/system/centos.vim
deleted file mode 100644
index 3c1dbc48..00000000
--- a/vim/system/centos.vim
+++ /dev/null
@@ -1,33 +0,0 @@
-" Revert settings that CentOS might have touched
-if $VIM !=# '/usr/share/vim'
- \ || !filereadable('/etc/centos-release')
- finish
-endif
-
-" Set options back to appropriate defaults
-set history&
-if has('cmdline_info')
- set ruler&
-endif
-if has('cscope')
- set cscopeprg&
- set cscopetag&
- set cscopetagorder&
- set cscopeverbose&
- silent! cscope kill
-endif
-if has('gui')
- set guicursor&
-endif
-if has('viminfo')
- set viminfo&
-endif
-
-" Restore terminal settings to reflect terminfo
-set t_Co& t_Sf& t_Sb&
-
-" Delete autocmd groups
-augroup redhat
- autocmd!
-augroup END
-augroup! redhat
diff --git a/vim/system/debian.vim b/vim/system/debian.vim
deleted file mode 100644
index 07649f07..00000000
--- a/vim/system/debian.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-" Revert settings that Debian might have touched
-if $VIM !=# '/usr/share/vim'
- \ || !filereadable('/etc/debian_version')
- finish
-endif
-
-" Set options back to appropriate defaults
-set history&
-set printoptions&
-set ruler&
-set suffixes&
-
-" Restore terminal settings to reflect terminfo
-set t_Co& t_Sf& t_Sb&
-
-" Remove addons directories from 'runtimepath' if present
-set runtimepath-=/var/lib/vim/addons
-set runtimepath-=/var/lib/vim/addons/after
diff --git a/vim/vimrc b/vim/vimrc
index 0456679f..ad30cd63 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,9 +1,6 @@
" Tom Ryder (tejr)'s vimrc: <https://sanctum.geek.nz/cgit/dotfiles.git>
" Requires Vim 7.0 or newer with +eval.
-" Undo anything the operating system's vimrc may have broken
-runtime system.vim
-
" Set an environment variable for the user runtime directory
if !exists('$MYVIM')
if has('win32') || has('win64')
@@ -37,6 +34,12 @@ else
set backupdir^=$MYVIM/cache/backup
endif
+" Restore insert mode 'backspace' limits to the stringent Vim default, if a
+" system vimrc or Neovim's heretical defaults has messed with it
+if &backspace !=# ''
+ set backspace=
+endif
+
" Add some *nix paths not to back up
if has('unix')
set backupskip^=/dev/shm/* " Shared memory RAM disk
@@ -151,6 +154,12 @@ if &ruler
set noruler
endif
+" Remove Debian's 'runtimepath' nonsense if present
+if &runtimepath =~# '/var/lib/vim/addons'
+ set runtimepath-=/var/lib/vim/addons
+ set runtimepath-=/var/lib/vim/addons/after
+endif
+
" Make sessions usable
set sessionoptions-=localoptions " No buffer options or mappings
set sessionoptions-=options " No global options or mappings