Merge commit 'refs/merge-requests/12' of git://gitorious.org/fish-shell/fish-shell into merge-requests/12

This commit is contained in:
Grissiom 2011-07-28 10:06:19 +08:00
commit 157ca12d4b

View File

@ -18,9 +18,9 @@ function __fish_complete_cd -d "Completions for the cd command"
end
if echo (commandline -ct)|sgrep '^/\|^\./\|^\.\./' >/dev/null
if echo '(commandline -ct)'|sgrep '^/\|^\./\|^\.\./' >/dev/null
# This is an absolute search path
eval printf '\%s\\tDirectory\\n' (commandline -ct)\*/
eval printf '\%s\\tDirectory\\n' '(commandline -ct)'\*/
else
# This is a relative search path
# Iterate over every directory in CDPATH
@ -33,7 +33,7 @@ function __fish_complete_cd -d "Completions for the cd command"
builtin cd $wd
eval builtin cd $i
eval printf '"%s\tDirectory in "'$i'"\n"' (commandline -ct)\*/
eval printf '"%s\tDirectory in "'$i'"\n"' '(commandline -ct)'\*/
end
end