aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2019-11-14 14:14:21 +1300
committerTom Ryder <tom@sanctum.geek.nz>2019-11-14 14:14:21 +1300
commit21a5051fd35fc5f50799790e447acabe3e0d5385 (patch)
treee7b5604d813f1299f45ee448181f5d6464dbf90d
parentdbbbec19cdf96f136d6656d69b17304cbcb4e293 (diff)
parent47af237f1470fe330ac9cbfd82358d92c1d83e93 (diff)
downloaddotfiles-21a5051fd35fc5f50799790e447acabe3e0d5385.tar.gz
dotfiles-21a5051fd35fc5f50799790e447acabe3e0d5385.zip
Merge branch 'release/v7.18.0'v7.18.0
* release/v7.18.0: Update PGP key Use rmdir(1) rather than `rm -r` in gms lock clear Don't color colon-delimited labels in Vim comments Improve extension histogram commands
-rw-r--r--VERSION4
-rw-r--r--bin/gms.sh4
-rw-r--r--finger/pgpkey8
-rw-r--r--vim/after/syntax/vim.vim4
-rw-r--r--vim/vimrc2
5 files changed, 12 insertions, 10 deletions
diff --git a/VERSION b/VERSION
index f1fdb869..85838060 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v7.17.0
-Wed, 25 Sep 2019 10:08:02 +0000
+tejr dotfiles v7.18.0
+Thu, 14 Nov 2019 01:14:18 +0000
diff --git a/bin/gms.sh b/bin/gms.sh
index c33c747e..abbbc063 100644
--- a/bin/gms.sh
+++ b/bin/gms.sh
@@ -4,7 +4,7 @@
lockdir=
cleanup() {
if [ -n "$lockdir" ] ; then
- rm -fr -- "$lockdir"
+ rmdir -- "$lockdir"
fi
if [ "$1" != EXIT ] ; then
trap - "$1"
@@ -25,7 +25,7 @@ for rcfile in "${GETMAIL:-"$HOME"/.getmail}"/getmailrc.* ; do (
lockdir=${TMPDIR:-/tmp}/getmail.$uid.${rcfile##*/}.lock
mkdir -m 0700 -- "$lockdir" 2>/dev/null || exit
try -n 3 -s 15 getmail --rcfile "$rcfile" "$@"
- rm -fr -- "$lockdir"
+ rmdir -- "$lockdir"
lockdir=
) & done
diff --git a/finger/pgpkey b/finger/pgpkey
index 3766bf41..f1c4c402 100644
--- a/finger/pgpkey
+++ b/finger/pgpkey
@@ -1,4 +1,4 @@
-pub rsa4096 2013-03-12 [C] [expires: 2019-11-22]
+pub rsa4096 2013-03-12 [C] [expires: 2020-01-18]
FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872
uid [ultimate] Thomas Ryder (tyrmored, tejr) <tom@sanctum.geek.nz>
uid [ultimate] Thomas Ryder <tejr@echo-n.nz>
@@ -6,9 +6,9 @@ uid [ultimate] Thomas Ryder <secretary@plug.org.nz>
uid [ultimate] Thomas Ryder (TEJR) <tejr@cpan.org>
uid [ultimate] Thomas Ryder <tyrmored@inspire.net.nz>
uid [ultimate] Thomas Ryder <tej.ryder@gmail.com>
-sub rsa4096 2013-03-12 [E] [expires: 2019-11-22]
+sub rsa4096 2013-03-12 [E] [expires: 2020-01-18]
9DF1 A89F F8D9 70AF 3265 C882 96C2 CD91 E67A C61D
-sub rsa4096 2013-03-12 [S] [expires: 2019-11-22]
+sub rsa4096 2013-03-12 [S] [expires: 2020-01-18]
3179 90A1 4597 A1FC F82D 953A B5AF 5F89 2592 6609
-sub rsa4096 2019-08-06 [A] [expires: 2019-11-22]
+sub rsa4096 2019-08-06 [A] [expires: 2020-01-18]
42AE 569D 6162 7C52 03B0 74ED D58F F1F0 7E90 9B49
diff --git a/vim/after/syntax/vim.vim b/vim/after/syntax/vim.vim
index e67803cc..438ce596 100644
--- a/vim/after/syntax/vim.vim
+++ b/vim/after/syntax/vim.vim
@@ -1,5 +1,7 @@
-" Remove special highlighting for double-quoted strings in comments
+" Remove special highlighting for double-quoted strings and colon labels in
+" comments
syntax clear vimCommentString
+syntax clear vimCommentTitle
" Highlight :CompilerSet commands like :set/:setlocal, but only in compiler
" scripts in recognisable paths
diff --git a/vim/vimrc b/vim/vimrc
index 609a1331..93efe27c 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -825,7 +825,7 @@ set wildmode=list:longest,full
" giving patterns for the top 100 alphanumeric extensions for files from the
" running user’s home directory:
"
-" $ (LC_ALL=C find "$HOME" ! -type d -name '*.?*' -exec \
+" $ (LC_ALL=C ; find "$HOME" ! -type d -name '*.?*' -exec \
" sh -c 'for fn ; do
" ext=${fn##*.}
" case $ext in