diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-09-13 10:41:28 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-09-13 10:41:28 +0000 |
| commit | 7eb928e2663197d52898b55cd2ccbe10c3222236 (patch) | |
| tree | c20c9867c251eac584a9f1c4e1271ed060d42624 /Completion/Core | |
| parent | 2ef449a71d2f681a85453e68b10d3af97dec14ff (diff) | |
| download | zsh-7eb928e2663197d52898b55cd2ccbe10c3222236.tar.gz zsh-7eb928e2663197d52898b55cd2ccbe10c3222236.tar.xz zsh-7eb928e2663197d52898b55cd2ccbe10c3222236.zip | |
manual/7796
Diffstat (limited to 'Completion/Core')
| -rw-r--r-- | Completion/Core/_display | 5 | ||||
| -rw-r--r-- | Completion/Core/_list | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Completion/Core/_display b/Completion/Core/_display index 210e866ec..d23361653 100644 --- a/Completion/Core/_display +++ b/Completion/Core/_display @@ -23,11 +23,12 @@ local _param="$1" _arr _len _i _tmp _simple # Remove all descriptions not matched by the string on the line. if [[ "${2[1]}" = \( ]]; then - _arr=( ${(o)=2[2,-2]} ) + _arr=( ${(Qo)=2[2,-2]} ) else _arr=( "${(@Po)2}" ) fi +_arr=( "${(@)_arr:#}" ) compadd -D _arr "${(@)argv[3,-1]}" - "${(@)_arr%%:*}" [[ "${2[1]}" != \( ]] && eval "${2}=( \"\$_arr[@]\" )" @@ -68,7 +69,7 @@ ${(r:_len:: :)_i%%:*} -- ${_i#*:}" (( $#_simple )) && _tmp="${_tmp} $(print -c - $_simple)" - eval "${_param}=${(q)_tmp[2,-1]}" + eval "${_param}=\"\${_tmp[2,-1]}\"" return 0 else diff --git a/Completion/Core/_list b/Completion/Core/_list index 28a5161d1..25dcdfe8f 100644 --- a/Completion/Core/_list +++ b/Completion/Core/_list @@ -43,7 +43,7 @@ fi # Should we only show a list now? if [[ ( -z "$compconfig[list_condition]" || - "${(e):-\$[$compconfig[expand_glob]]}" -eq 1 ) && + "${(e):-\$[$compconfig[list_condition]]}" -eq 1 ) && ( "$pre" != "$_list_prefix" || "$suf" != "$_list_suffix" ) ]]; then # Yes. Tell the completion code about it and save the new values |