From 1912a575fbdf34e4937eeea9387807351342fc37 Mon Sep 17 00:00:00 2001 From: Marlon Richert Date: Sat, 7 Aug 2021 22:52:21 +0300 Subject: [PATCH] Set $COLUMNS in _call_program to ensure cached command output is sufficiently wide --- Completion/Base/Utility/_call_program | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Completion/Base/Utility/_call_program b/Completion/Base/Utility/_call_program index 73f3ef6d2..cc7c9adf9 100644 --- a/Completion/Base/Utility/_call_program +++ b/Completion/Base/Utility/_call_program @@ -1,6 +1,7 @@ #autoload +X -local curcontext="${curcontext}" tmp err_fd=-1 clocale='_comp_locale;' +local cmd clocale='_comp_locale;' cols='COLUMNS=999' curcontext="${curcontext}" +local -i err_fd=-1 local -a prefix if [[ "$1" = -p ]]; then @@ -22,14 +23,14 @@ fi { # Begin "always" block -if zstyle -s ":completion:${curcontext}:${1}" command tmp; then - if [[ "$tmp" = -* ]]; then - eval $clocale "$tmp[2,-1]" "$argv[2,-1]" +if zstyle -s ":completion:${curcontext}:${1}" command cmd; then + if [[ "$cmd" = -* ]]; then + eval $clocale $cols "$cmd[2,-1]" "$argv[2,-1]" else - eval $clocale $prefix "$tmp" + eval $clocale $cols $prefix "$cmd" fi else - eval $clocale $prefix "$argv[2,-1]" + eval $clocale $cols $prefix "$argv[2,-1]" fi 2>&$err_fd } always { -- 2.30.1 (Apple Git-130)