summaryrefslogtreecommitdiff
path: root/plugins/colemak
diff options
context:
space:
mode:
authorTuowen Zhao <ztuowen@gmail.com>2021-09-10 20:10:26 -0600
committerTuowen Zhao <ztuowen@gmail.com>2021-09-10 20:10:26 -0600
commit3c73976ef306d68a85d60c94be9a1dcdc33fa2bf (patch)
tree619ba4b5874b92ada9dc089c67a435dd3149748a /plugins/colemak
parentf8b7b6584bf1ca7e836ba9cc13fcce573047fb07 (diff)
parent735808f48d54aabce540f6c90294e21118104cf4 (diff)
downloadzsh-3c73976ef306d68a85d60c94be9a1dcdc33fa2bf.tar.gz
zsh-3c73976ef306d68a85d60c94be9a1dcdc33fa2bf.tar.bz2
zsh-3c73976ef306d68a85d60c94be9a1dcdc33fa2bf.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'plugins/colemak')
-rw-r--r--plugins/colemak/.gitignore1
-rw-r--r--plugins/colemak/colemak.plugin.zsh13
2 files changed, 13 insertions, 1 deletions
diff --git a/plugins/colemak/.gitignore b/plugins/colemak/.gitignore
new file mode 100644
index 000000000..8241f5ed6
--- /dev/null
+++ b/plugins/colemak/.gitignore
@@ -0,0 +1 @@
+.less
diff --git a/plugins/colemak/colemak.plugin.zsh b/plugins/colemak/colemak.plugin.zsh
index cb7cc5068..8d3393c44 100644
--- a/plugins/colemak/colemak.plugin.zsh
+++ b/plugins/colemak/colemak.plugin.zsh
@@ -19,4 +19,15 @@ bindkey -a 'N' vi-join
bindkey -a 'j' vi-forward-word-end
bindkey -a 'J' vi-forward-blank-word-end
-lesskey $ZSH/plugins/colemak/colemak-less
+# New less versions will read this file directly
+export LESSKEYIN="${0:h:A}/colemak-less"
+
+# Only run lesskey if less version is older than v582
+less_ver=$(less --version | awk '{print $2;exit}')
+autoload -Uz is-at-least
+if ! is-at-least 582 $less_ver; then
+ # Old less versions will read this transformed file
+ export LESSKEY="${0:h:A}/.less"
+ lesskey -o "$LESSKEY" "$LESSKEYIN" 2>/dev/null
+fi
+unset less_ver