diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Completion/Unix/Type/_path_files | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 763c903c6..37a6fd9dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-06-03 Barton E. Schaefer <schaefer@zsh.org> + + * users/21609: Completion/Unix/Type/_path_files: do not treat + tilde-expansions as quoted when inside command substitutions + 2016-06-03 Marko Myllynen <myllynen@redhat.com> * 38587: Completion/Linux/Command/_iconvconfig: Fix iconvconfig diff --git a/Completion/Unix/Type/_path_files b/Completion/Unix/Type/_path_files index c64ebf58c..14c4cc753 100644 --- a/Completion/Unix/Type/_path_files +++ b/Completion/Unix/Type/_path_files @@ -273,7 +273,7 @@ if [[ "$pre" = [^][*?#^\|\<\>\\]#(\`[^\`]#\`|\$)*/* && "$compstate[quote]" != \' orig="${orig[1,(in:i:)/][1,-2]}" donepath= prepaths=( '' ) -elif [[ "$pre[1]" = \~ && -z "$compstate[quote]" ]]; then +elif [[ "$pre[1]" = \~ && "$compstate[quote]" = (|\`) ]]; then # It begins with `~', so remember anything before the first slash to be able # to report it to the completion code. Also get an expanded version of it |