diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2009-02-28 07:11:31 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2009-02-28 07:11:31 +0000 |
| commit | 027ce9a00134c1f9c272739042e7133ad792dec7 (patch) | |
| tree | 1e5ccee8165faaaeab793b4dca9d0d844755d5ff /Completion | |
| parent | a85db682710c7435e1093844491b4caa35aee90e (diff) | |
| download | zsh-027ce9a00134c1f9c272739042e7133ad792dec7.tar.gz zsh-027ce9a00134c1f9c272739042e7133ad792dec7.zip | |
26609: _path_files: better (?) fix for globcomplete.
unposted: _pick_variant: explicit rather than implicit success return.
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Base/Utility/_pick_variant | 2 | ||||
| -rw-r--r-- | Completion/Unix/Type/_path_files | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Completion/Base/Utility/_pick_variant b/Completion/Base/Utility/_pick_variant index a80cddb26..01fa2b98f 100644 --- a/Completion/Base/Utility/_pick_variant +++ b/Completion/Base/Utility/_pick_variant @@ -25,7 +25,7 @@ for cmd pat in "$var[@]"; do if [[ $output = *$~pat* ]]; then (( $+opts[-r] )) && eval "${opts[-r]}=$cmd" _cmd_variant[$opts[-c]]="$cmd" - return + return 0 fi done diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files index 2ce2c0cb2..fceebec4c 100644 --- a/Completion/Unix/Type/_path_files +++ b/Completion/Unix/Type/_path_files @@ -670,9 +670,9 @@ for prepath in "$prepaths[@]"; do "$pfxsfx[@]" $Mopts ) if [[ -z "$listsfx" ]]; then for i in "$tmp1[@]"; do - tmpdisp=("${i%%/*}") + tmpdisp=("$i") _list_files tmpdisp "$prepath$realpath$testpath" - compadd "$tmp4[@]" -s "/${i#*/}${Uopt:+$ISUFFIX}" $listopts - "$tmpdisp" + compadd "$tmp4[@]" -s "${Uopt:+$ISUFFIX}" $listopts - "$tmpdisp" done else [[ -n "$compstate[pattern_match]" ]] && SUFFIX="${SUFFIX:s./.*/}*" |