aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-18 17:11:41 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-18 17:11:41 +1200
commit7316bd54108b65317ba39b1c861a6516033d642f (patch)
tree260872c80c49554614e696fb9c55aae92a22295f
parentMerge branch 'release/v6.27.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-6.28.0.tar.gz (sig)
dotfiles-6.28.0.zip
Merge branch 'release/v6.28.0'v6.28.0
* release/v6.28.0: Add some more commentary More Vim compatibility tweaks Remove 'shiftwidth', add 'showmatch' in ~/.exrc
-rw-r--r--VERSION4
-rw-r--r--ex/exrc2
-rw-r--r--vim/vimrc.stub.vim22
3 files changed, 18 insertions, 10 deletions
diff --git a/VERSION b/VERSION
index ad9474ea..6f6b8700 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.27.0
-Tue, 18 Jun 2019 05:02:23 +0000
+tejr dotfiles v6.28.0
+Tue, 18 Jun 2019 05:11:40 +0000
diff --git a/ex/exrc b/ex/exrc
index 355b48ee..c1214c2f 100644
--- a/ex/exrc
+++ b/ex/exrc
@@ -1,5 +1,5 @@
" POSIX ex/vi settings
set autoindent
set report=0
-set shiftwidth=4
+set showmatch
set showmode
diff --git a/vim/vimrc.stub.vim b/vim/vimrc.stub.vim
index a7136aec..dfadac92 100644
--- a/vim/vimrc.stub.vim
+++ b/vim/vimrc.stub.vim
@@ -1,18 +1,26 @@
+" We have a big, important decision to make here.
+"
" Check that we're not running in 'compatible' mode, nor that the environment
" calls for the same, and that we're running Vim v7.0.0 or newer. If it's all
-" clear, we can load the main vimrc file from ~/.vim/vimrc, and then stop
-" sourcing the rest of this file.
+" clear, we can load the main vimrc file from ~/.vim/vimrc to use Vim in all
+" of its incompatible glory, and then stop sourcing the rest of this file.
"
if !&compatible && !exists('$POSIXLY_CORRECT') && v:version >= 700
runtime vimrc
finish
endif
-" If we get this far, it means we're running a tiny, 'compatible', and/or
-" ancient version of Vim. Force 'compatible' on, remove our user runtime
-" directory, and start vi v3.7 from July 1985. Don't grizzle, just use it.
-" It's good for you, like raisin bran.
+" If we got this far, it means we're running a tiny, 'compatible', and/or
+" ancient version of Vim.
+"
+" So, strip out our user runtime directories from 'runtimepath', force
+" 'compatible' on, source your trusty ~/.exrc, put on your dubbed cassette
+" copy of Kraftwerk's 'Computerwelt', and start using Sun OS 4.x vi v3.7, from
+" July 1985.
+"
+" Don't grizzle, just use it. It's good for you, like raisin bran.
"
-set compatible
set runtimepath-=~/.vim
set runtimepath-=~/.vim/after
+set compatible
+silent! source ~/.exrc