diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2021-08-17 09:37:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-17 09:37:01 +0200 |
| commit | 33847956d9969866dd8b502ffc88af58d2b427fe (patch) | |
| tree | e81fc7a0640e9d4ae74d3ba60d0219464e3770b0 /plugins/colemak | |
| parent | 11e22ed0b5c1aebd6e990ea7a885bdf03ab6555a (diff) | |
| download | zsh-33847956d9969866dd8b502ffc88af58d2b427fe.tar.gz zsh-33847956d9969866dd8b502ffc88af58d2b427fe.tar.bz2 zsh-33847956d9969866dd8b502ffc88af58d2b427fe.zip | |
fix(colemak): remove `lesskey` usage in less v582 and newer (#10102)
Diffstat (limited to 'plugins/colemak')
| -rw-r--r-- | plugins/colemak/.gitignore | 1 | ||||
| -rw-r--r-- | plugins/colemak/colemak.plugin.zsh | 13 |
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 |