github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 10:06:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix cd completions if a directory exists in $CDPATH and $PWD"

Browse Source 
That's not what happens - I had set CDPATH to start with ".".

See #4484.

This reverts commit 1af38d69a8.
This commit is contained in:
Fabian Homborg 2017-10-16 19:33:38 +02:00
parent a9283803d4
commit d18b0be518
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/functions/__fish_complete_cd.fish
View File

@ -30,14 +30,9 @@ function __fish_complete_cd -d "Completions for the cd command"
set -l desc (string replace -r -- "^$HOME" "~" "$cdpath")
# This assumes the CDPATH component itself is cd-able.
for d in $cdpath/$token*/
set -l withoutcdpath (string replace -- "$cdpath/" "" $d)
# Skip if the path exists in the current directory, since that's what `cd` will use.
if test -d "$withoutcdpath" -a -x "$withoutcdpath"
continue
end
# Remove the cdpath component again.
test -x $d
and printf "%s\tCDPATH %s\n" "$withoutcdpath" $desc
and printf "%s\tCDPATH %s\n" (string replace -r "^$cdpath/" "" -- $d) $desc
end
end
end