aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-06-16 17:53:14 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-06-16 17:53:14 +1200
commitd17996955255c24d6c6fd6ffdb11d58d2f95d698 (patch)
tree32c05f9bf8a9688fccebabb02ea26dfc22e99f48
parentMerge branch 'release/v6.16.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-d17996955255c24d6c6fd6ffdb11d58d2f95d698.tar.gz
dotfiles-d17996955255c24d6c6fd6ffdb11d58d2f95d698.zip
Merge branch 'release/v6.17.0'v6.17.0
* release/v6.17.0: Turn on 'showmatch' if matchparen.vim not there
-rw-r--r--VERSION4
-rw-r--r--vim/vimrc10
2 files changed, 12 insertions, 2 deletions
diff --git a/VERSION b/VERSION
index 613a7c1f..22586eb1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v6.16.0
-Sun, 16 Jun 2019 05:38:25 +0000
+tejr dotfiles v6.17.0
+Sun, 16 Jun 2019 05:53:13 +0000
diff --git a/vim/vimrc b/vim/vimrc
index 347299e0..93db7ac9 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -805,6 +805,16 @@ set sessionoptions-=options " No global options or mappings
"
set shortmess+=I
+" We'll only use the old 'showmatch' method of a brief jump to the matching
+" bracket under the cursor if the much-preferred matchparen.vim standard
+" plugin doesn't look like it's going to load, whether because plugins have
+" been disabled, or it's not in any of the plugin directories.
+"
+if !&loadplugins
+ \ && globpath(&runtimepath, 'plugin/matchparen.vim') !=# ''
+ set showmatch matchtime=3
+endif
+
" I find the defaults of new windows opening above or to the left of the
" previous window too jarring, because I'm used to both the i3 window manager
" and the tmux terminal multiplexer doing it the other way around, in reading