aboutsummaryrefslogtreecommitdiff
path: root/vim
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-12 20:31:12 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-12 20:32:26 +1200
commit12dff6de62cef80a65752697687d66572c810478 (patch)
tree0206be3c0f453614d929ef13575129016647611a /vim
parentFine-tune perlcritic/perltidy installs (diff)
downloaddotfiles-12dff6de62cef80a65752697687d66572c810478.tar.gz
dotfiles-12dff6de62cef80a65752697687d66572c810478.zip
Try a compatibility switch on vi/vim
Diffstat (limited to 'vim')
-rw-r--r--vim/vimrc.stub15
1 files changed, 9 insertions, 6 deletions
diff --git a/vim/vimrc.stub b/vim/vimrc.stub
index d50cee55..f9ad4d4f 100644
--- a/vim/vimrc.stub
+++ b/vim/vimrc.stub
@@ -1,13 +1,16 @@
" 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 to use Vim in all
-" of its incompatible glory, and then stop sourcing the rest of this file.
+" calls for the same, that we’re running Vim v7.0.0 or newer, and that we
+" haven't been invoked as just plain `vi`. If it’s all 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
+if !&compatible && !exists('$POSIXLY_CORRECT')
+ if v:version >=700 && v:progname !=# 'vi'
+ runtime vimrc
+ finish
+ endif
endif
" If we got this far, it means we’re running a tiny, 'compatible', and/or