diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2015-05-05 23:32:59 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2015-05-05 23:58:59 +0200 |
| commit | db38e167634b6c2217eec3a5aafc37c46d9e5a8d (patch) | |
| tree | daa342d423febbd3a5a7ef97053037677fab004a /Completion/compinit | |
| parent | 01eea47617a6e06debdb4330f92ae69f92089fd2 (diff) | |
| parent | 3c3c8d3d13fd4cf6c03f81ca8dc18a1efd561728 (diff) | |
| download | zsh-db38e167634b6c2217eec3a5aafc37c46d9e5a8d.tar.gz zsh-db38e167634b6c2217eec3a5aafc37c46d9e5a8d.zip | |
Merge branch 'upstream' into debian
Diffstat (limited to 'Completion/compinit')
| -rw-r--r-- | Completion/compinit | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Completion/compinit b/Completion/compinit index f9d2c574c..9470c92f6 100644 --- a/Completion/compinit +++ b/Completion/compinit @@ -105,17 +105,17 @@ done # The associative arrays containing the definitions for the commands and # services. -typeset -gA _comps _services _patcomps _postpatcomps +typeset -gHA _comps _services _patcomps _postpatcomps # `_compautos' contains the names and options for autoloaded functions # that get options. -typeset -gA _compautos +typeset -gHA _compautos # The associative array use to report information about the last # completion to the outside. -typeset -gA _lastcomp +typeset -gHA _lastcomp # Remember dumpfile. if [[ -n $_i_dumpfile ]]; then @@ -127,12 +127,13 @@ fi # The standard options set in completion functions. -typeset -ga _comp_options +typeset -gHa _comp_options _comp_options=( bareglobqual extendedglob glob multibyte + multifuncdef nullglob rcexpandparam unset @@ -161,7 +162,7 @@ _comp_options=( # have a valid stdin descriptor (zle closes it before calling widgets) # and don't get confused by user's ZERR trap handlers. -typeset -g _comp_setup='local -A _comp_caller_options; +typeset -gH _comp_setup='local -A _comp_caller_options; _comp_caller_options=(${(kv)options[@]}); setopt localoptions localtraps localpatterns ${_comp_options[@]}; local IFS=$'\'\ \\t\\r\\n\\0\'' |