aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-05-03 13:38:05 +1200
committerTom Ryder <tom@sanctum.geek.nz>2019-05-03 13:38:05 +1200
commita06d94ba392578f92e8e18ab709bd4563d5f7c5c (patch)
tree74b41c1f8481436690d982ba510ed4a43c16e17a
parentdd1b9b2e1ba1ee926400de248a2d9edce8378eaf (diff)
parentebc42be319bfaba43c98128e78c21b79fbadb31c (diff)
downloaddotfiles-4.19.0.tar.gz
Merge branch 'release/v4.19.0'v4.19.0
* release/v4.19.0: Bump VERSION Update some URLs in documentation Adjust matchit words for Vim filetype
-rw-r--r--README.md8
-rw-r--r--VERSION4
-rw-r--r--vim/after/ftplugin/vim.vim12
3 files changed, 18 insertions, 6 deletions
diff --git a/README.md b/README.md
index ceedf66f..3a5fa11c 100644
--- a/README.md
+++ b/README.md
@@ -104,13 +104,13 @@ Configuration is included for:
for Perl
* [Perl::Tidy](http://perltidy.sourceforge.net/) -- Perl source code
reformatter
-* [Readline](https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html) -- GNU
+* [Readline](https://tiswww.case.edu/php/chet/readline/rltop.html) -- GNU
library for user input used by Bash, MySQL, and others
* [rxvt-unicode](http://software.schmorp.de/pkg/rxvt-unicode.html) -- Fork of
the rxvt terminal emulator with Unicode support
* [Subversion](https://subversion.apache.org/) -- Apache Subversion, a version
control system
-* [tidy](http://www.html-tidy.org/) -- HTML/XHTML linter and tidier
+* [tidy](https://www.html-tidy.org/) -- HTML/XHTML linter and tidier
* [tmux](https://tmux.github.io/) -- Terminal multiplexer similar to GNU Screen
* [Vim](https://www.vim.org/) -- Vi IMproved, a text editor
* [Neovim](https://neovim.io/) -- An "emphatic fork" of Vim
@@ -139,7 +139,7 @@ On GNU/Linux I use Bash, on BSD I use some variant of Korn Shell, preferably
`ksh93` if it's available.
My Bash is written to work with [any version 3.0 or
-newer](http://wiki.bash-hackers.org/scripting/bashchanges). This is why I use
+newer](https://wiki.bash-hackers.org/scripting/bashchanges). This is why I use
older syntax for certain things such as appending items to arrays:
array[${#array[@]}]=$item
@@ -312,7 +312,7 @@ be using a PGP implementation, and I encrypt whenever I have a public key
available for them. The GnuPG and S/MIME interfacing is done with
[GPGme](https://www.gnupg.org/related_software/gpgme/), rather than defining
commands for each crypto operation. I wrote [an article about this
-setup](https://sanctum.geek.nz/arabesque/linux-crypto-email/) if it sounds
+setup](https://sanctum.geek.nz/arabesque/gnu-linux-crypto-email/) if it sounds
appealing.
You'll need Abook installed if you want to use the `query_command` I have
diff --git a/VERSION b/VERSION
index 99e31cbf..d5e22a6d 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v4.18.0
-Mon Apr 1 08:05:38 UTC 2019
+tejr dotfiles v4.19.0
+Fri May 3 01:38:05 UTC 2019
diff --git a/vim/after/ftplugin/vim.vim b/vim/after/ftplugin/vim.vim
index d2fa77e2..790dd38e 100644
--- a/vim/after/ftplugin/vim.vim
+++ b/vim/after/ftplugin/vim.vim
@@ -16,6 +16,18 @@ if &keywordprg !=# ':help'
let b:undo_ftplugin .= '|setlocal keywordprg<'
endif
+" Adjust the match words for the matchit plugin; the default filetype plugin
+" matches e.g. an opening "function" with the first "return" within, which I
+" don't like
+if exists('g:loaded_matchit')
+ let b:match_words =
+ \ '\<fu\%[nction]\>:\<endf\%[unction]\>,' .
+ \ '\<\(wh\%[ile]\|for\)\>:\<end\(w\%[hile]\|fo\%[r]\)\>,' .
+ \ '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>,' .
+ \ '\<try\>:\<cat\%[ch]\>:\<fina\%[lly]\>:\<endt\%[ry]\>,' .
+ \ '\<aug\%[roup]\s\+\%(END\>\)\@!\S:\<aug\%[roup]\s\+END\>,'
+endif
+
" Stop here if the user doesn't want ftplugin mappings
if exists('g:no_plugin_maps') || exists('g:no_vim_maps')
finish