diff options
Diffstat (limited to 'Completion/Core')
-rw-r--r-- | Completion/Core/compdump | 3 | ||||
-rw-r--r-- | Completion/Core/compinit | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Completion/Core/compdump b/Completion/Core/compdump index c577747a1..0d8666f75 100644 --- a/Completion/Core/compdump +++ b/Completion/Core/compdump @@ -14,13 +14,14 @@ # to see if auto-dump should re-dump the dump-file. emulate -L zsh +setopt extendedglob typeset _d_file _d_f _d_bks _d_line _d_als _d_file=${_comp_dumpfile-${0:h}/compinit.dump}.$HOST.$$ typeset -U _d_files -_d_files=( ${^~fpath:/.}/_(|*[^~])(N:t) ) +_d_files=( ${^~fpath:/.}/^([^_]*|*~|*.zwc)(N:t) ) print "#files: $#_d_files" > $_d_file diff --git a/Completion/Core/compinit b/Completion/Core/compinit index 5aaaea8fe..a421c2d8d 100644 --- a/Completion/Core/compinit +++ b/Completion/Core/compinit @@ -56,6 +56,7 @@ # default dumpfile) is now the default; to turn off dumping use -D. emulate -L zsh +setopt extendedglob typeset _i_dumpfile _i_files _i_line _i_done _i_dir _i_autodump=1 typeset _i_tag _i_file _i_addfiles @@ -419,7 +420,7 @@ zstyle ':completion:*:options' prefix-hidden yes" # Now we automatically make the definition files autoloaded. typeset -U _i_files -_i_files=( ${^~fpath:/.}/_(|*[^~])(N:t) ) +_i_files=( ${^~fpath:/.}/^([^_]*|*~|*.zwc)(N:t) ) if [[ $#_i_files -lt 20 || $_compdir = */Core || -d $_compdir/Core ]]; then # Too few files: we need some more directories, # or we need to check that all directories (not just Core) are present. @@ -438,7 +439,7 @@ if [[ $#_i_files -lt 20 || $_compdir = */Core || -d $_compdir/Core ]]; then _i_addfiles[$_i_line]= done fpath=($fpath $_i_addfiles) - _i_files=( ${^~fpath:/.}/_(|*[^~])(N:t) ) + _i_files=( ${^~fpath:/.}/^([^_]*|*~|*.zwc)(N:t) ) fi fi @@ -468,7 +469,7 @@ fi if [[ -z "$_i_done" ]]; then for _i_dir in $fpath; do [[ $_i_dir = . ]] && continue - for _i_file in $_i_dir/_(|*[^~])(N); do + for _i_file in $_i_dir/^([^_]*|*~|*.zwc)(N); do read -rA _i_line < $_i_file _i_tag=$_i_line[1] shift _i_line |