aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-11-12 10:34:39 +1300
committerTom Ryder <tom@sanctum.geek.nz>2020-11-12 10:34:39 +1300
commit8e5da0d052d44249c1a262b198d50d455a27785e (patch)
treee0ade9d639560549ece06e36501c5775ae18d1f3
parentMerge branch 'release/v10.13.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-8e5da0d052d44249c1a262b198d50d455a27785e.tar.gz
dotfiles-8e5da0d052d44249c1a262b198d50d455a27785e.zip
Merge branch 'release/v10.14.0'v10.14.0
* release/v10.14.0: Simplify han(1df) to remove unneeded temp dir Rewrap comments in vimrc Update vim-redact-pass to v2.2.1
-rw-r--r--VERSION4
-rw-r--r--bin/han.bash22
m---------vim/bundle/redact_pass0
-rw-r--r--vim/vimrc14
4 files changed, 12 insertions, 28 deletions
diff --git a/VERSION b/VERSION
index 3b1f85f7..2bc5d6ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v10.13.0
-Sun, 11 Oct 2020 00:22:33 +0000
+tejr dotfiles v10.14.0
+Wed, 11 Nov 2020 21:34:36 +0000
diff --git a/bin/han.bash b/bin/han.bash
index 6ab0b3e7..2cac9d4e 100644
--- a/bin/han.bash
+++ b/bin/han.bash
@@ -13,22 +13,6 @@ if ((BASH_VERSINFO[0] >= 4)) ; then
helpopts=(-m)
fi
-# Create a temporary directory with name in $td, and a trap to remove it when
-# the script exits
-td=
-cleanup() {
- [[ -n $td ]] && rm -fr -- "$td"
-}
-trap cleanup EXIT
-td=$(mktd "$self") || exit
-
-# If we have exactly one argument and a call to the help builtin with that
-# argument succeeds, display its output with `pager -s`
-if (($# == 1)) &&
- help "${helpopts[@]}" "$1" >"$td"/"$1".help 2>/dev/null ; then
- (cd -- "$td" && "$PAGER" -s -- "$1".help)
-
-# Otherwise, just pass all the arguments to man(1)
-else
- man "$@"
-fi
+# Call `help`, with the `-m` flag if available; if it errors out (discard
+# stderr), run `man` instead
+help "${helpopts[@]}" -- "$@" 2>/dev/null || man -- "$@"
diff --git a/vim/bundle/redact_pass b/vim/bundle/redact_pass
-Subproject 337e7498e2b483e79c9abb33a2feb670655b23d
+Subproject 0fa145b0014c57e21eadd251eb69c61c0598a03
diff --git a/vim/vimrc b/vim/vimrc
index 26407eea..425a1d5b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
" Tom Ryder (tejr)’s Literate Vimrc
" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
"
-" Last updated: Fri, 09 Oct 2020 08:52:09 UTC
+" Last updated: Fri, 23 Oct 2020 08:28:38 UTC
"
" │ And I was lifted up in heart, and thought
" │ Of all my late-shown prowess in the lists,
@@ -256,12 +256,12 @@ endif
if has('unix')
" Prior to v8.1.1519, Vim didn’t check patterns added to 'backupskip' for
- " uniqueness, so adding the same path repeatedly resulted in duplicate strings
- " in the value. This was due to the absence of the P_NODUP flag for the
- " option’s definition in src/option.c in the Vim source code. If we’re using
- " a version older than v8.1.1519, we’ll need to explicitly reset 'backupskip'
- " to its default value before adding patterns to it, so that reloading this
- " file doesn’t stack up multiple copies of any added paths.
+ " uniqueness, so adding the same path repeatedly resulted in duplicate
+ " strings in the value. This was due to the absence of the P_NODUP flag for
+ " the option’s definition in src/option.c in the Vim source code. If we’re
+ " using a version older than v8.1.1519, we’ll need to explicitly reset
+ " 'backupskip' to its default value before adding patterns to it, so that
+ " reloading this file doesn’t stack up multiple copies of any added paths.
"
" <https://github.com/vim/vim/releases/tag/v8.1.1519>
"