From e1ba30afae4e0a81bec3c4e3616711ed1e265fad Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Fri, 19 Sep 2014 19:42:45 -0700 Subject: 33205: keep array of completions and array of display strings in sync when filtering for matches --- ChangeLog | 6 ++++++ Completion/Base/Utility/_describe | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 27b567740..857b7dba5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-09-19 Barton E. Schaefer + + * 33205: Completion/Base/Utility/_describe: if passed both an + array of completions and an array of display strings, keep them + in sync when filtering for matches. + 2014-09-18 Peter Stephenson * users/19097: Doc/Zsh/mod_parameter.yo, diff --git a/Completion/Base/Utility/_describe b/Completion/Base/Utility/_describe index f899b0ad0..1a9f52f5d 100644 --- a/Completion/Base/Utility/_describe +++ b/Completion/Base/Utility/_describe @@ -96,7 +96,7 @@ while _tags; do fi if [[ -n $_mats ]]; then - compadd "$_opts[@]" "${(@)_expl:/-J/-2V}" -D $_strs - \ + compadd "$_opts[@]" "${(@)_expl:/-J/-2V}" -D $_strs -O $_mats - \ "${(@)${(@M)${(@P)_mats}##([^:\\]|\\?)##}//\\(#b)(?)/$match[1]}" else compadd "$_opts[@]" "${(@)_expl:/-J/-2V}" -D $_strs - \ -- cgit v1.2.3-70-g09d2