diff options
| author | Tanaka Akira <akr@users.sourceforge.net> | 1999-11-22 13:31:14 +0000 |
|---|---|---|
| committer | Tanaka Akira <akr@users.sourceforge.net> | 1999-11-22 13:31:14 +0000 |
| commit | e37ffd5b702b6d219716716a8498cf07e1683546 (patch) | |
| tree | 3d104a8eb3b6debb05f1ed87657072c368dc2b93 /Completion | |
| parent | 2450b27486797013032924792de846076e29552c (diff) | |
| download | zsh-e37ffd5b702b6d219716716a8498cf07e1683546.tar.gz zsh-e37ffd5b702b6d219716716a8498cf07e1683546.tar.xz zsh-e37ffd5b702b6d219716716a8498cf07e1683546.zip | |
zsh-workers/8722
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Base/_arguments | 2 | ||||
| -rw-r--r-- | Completion/Core/_path_files | 14 | ||||
| -rw-r--r-- | Completion/User/_telnet | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments index 43f5bb878..f7e1cdedd 100644 --- a/Completion/Base/_arguments +++ b/Completion/Base/_arguments @@ -199,7 +199,7 @@ if comparguments -i "$autod" "$@"; then comparguments -W line opt_args state="${${action[3,-1]##[ ]#}%%[ ]#}" if [[ -n "$usecc" ]]; then - curcontext="$subc" + curcontext="${oldcontext}:$subc" else context="$subc" fi diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files index 41956d543..71ee3b218 100644 --- a/Completion/Core/_path_files +++ b/Completion/Core/_path_files @@ -110,9 +110,19 @@ orig="${PREFIX}${SUFFIX}" ( $#compstate[pattern_match] -ne 0 && "${orig#\~}" != "${${orig#\~}:q}" ) ]] && menu=yes -# If given no `-F' option, we want to use `fignore'. +# If given no `-F' option, we want to use the `ignored-suffixes'-style. -(( $#ignore )) || ignore=(-F fignore) +if (( ! $#ignore )); then + if _style -a files ignored-suffixes ignore; then + ignore=(-F "( $ignore )") + else + + # For now we still use the fignore parameter. + # This may be removed some day. + + ignore=(-F fignore) + fi +fi # Now let's have a closer look at the string to complete. diff --git a/Completion/User/_telnet b/Completion/User/_telnet index 7b86e544c..81780e171 100644 --- a/Completion/User/_telnet +++ b/Completion/User/_telnet @@ -73,7 +73,7 @@ ports) _wanted ports expl port && _combination '' hosts-ports-users \ ${opt_args[-l]:+users=${opt_args[-l]:q}} \ - hosts="${line[2]:q}" \ + hosts="${line[1]:q}" \ ports "$expl[@]" ;; |