diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
| commit | c7c51eca164ea2e23c1f10b0e63030e66588f27a (patch) | |
| tree | 15e78786da9562f49ad284e5dad2e190694a885f /Completion | |
| parent | 026cb6a8127dfb9a6277ec42cc251ebc77e1300e (diff) | |
| parent | 8efa4b4088a9f57903954a12eb086b176109bd91 (diff) | |
| download | zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.tar.gz zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.tar.xz zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.zip | |
Fix conflicts in ChangeLog
Diffstat (limited to 'Completion')
| -rw-r--r-- | Completion/Base/Utility/_regex_words | 8 | ||||
| -rw-r--r-- | Completion/Unix/Command/_curl | 7 | ||||
| -rw-r--r-- | Completion/Unix/Type/_urls | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/Completion/Base/Utility/_regex_words b/Completion/Base/Utility/_regex_words index 77ba197a4..62c2491bb 100644 --- a/Completion/Base/Utility/_regex_words +++ b/Completion/Base/Utility/_regex_words @@ -20,7 +20,13 @@ local tag=$1 local desc=$2 shift 2 -reply=(\() +if (( $# )); then + reply=(\() +else + # ### Is this likely to happen in callers? Should we warn? + reply=() + return +fi integer i local -a wds diff --git a/Completion/Unix/Command/_curl b/Completion/Unix/Command/_curl new file mode 100644 index 000000000..72e2e5b53 --- /dev/null +++ b/Completion/Unix/Command/_curl @@ -0,0 +1,7 @@ +#compdef curl + +# As of 7.43.0, curl upstream provides its own _curl definition. This +# definition is provided as a fallback, and should be installed later +# in $fpath than the curl-provided definition of _curl. + +_urls "$@" diff --git a/Completion/Unix/Type/_urls b/Completion/Unix/Type/_urls index 6f23803ed..e81eaac05 100644 --- a/Completion/Unix/Type/_urls +++ b/Completion/Unix/Type/_urls @@ -1,4 +1,4 @@ -#compdef curl -value-,WWW_HOME,-default- -P -value-,(ftp|http(|s))_proxy,-default- +#compdef -value-,WWW_HOME,-default- -P -value-,(ftp|http(|s))_proxy,-default- # Configuration styles used: # |