diff options
Diffstat (limited to 'Completion/Core')
| -rw-r--r-- | Completion/Core/_expand | 4 | ||||
| -rw-r--r-- | Completion/Core/_main_complete | 2 | ||||
| -rw-r--r-- | Completion/Core/_path_files | 2 | ||||
| -rw-r--r-- | Completion/Core/compdump | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Completion/Core/_expand b/Completion/Core/_expand index 09d89a30b..bcc357ead 100644 --- a/Completion/Core/_expand +++ b/Completion/Core/_expand @@ -63,7 +63,7 @@ if [[ "$force" = *s* ]] || eval exp\=\( ${${(q)exp}:gs/\\{/\{/:gs/\\}/\}/} \) eval 'exp=( ${${(e)exp//\\[ ]/ }//(#b)([ -])/\\$match[1]} )' 2>/dev/null +\\])/\\$match[1]} )' 2>/dev/null else exp=( ${exp:s/\\\$/\$} ) fi @@ -77,7 +77,7 @@ subd=("$exp[@]") # Now try globbing. [[ "$force" = *g* ]] || zstyle -T ":completion:${curcontext}:" glob && - eval 'exp=( ${~exp} )' 2>/dev/null + eval 'exp=( ${~exp} ); exp=( ${exp//(#b)([][()|*?^#~<>\\])/\\${match[1]}} )' 2>/dev/null # If we don't have any expansions or only one and that is the same # as the original string, we let other completers run. diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete index 7f0e94358..8c856f4be 100644 --- a/Completion/Core/_main_complete +++ b/Completion/Core/_main_complete @@ -16,7 +16,7 @@ # which makes the output of setopt and unsetopt reflect a different # state than the global one for which you are completing. -setopt localoptions nullglob rcexpandparam extendedglob +setopt localoptions nullglob rcexpandparam extendedglob noshglob unsetopt markdirs globsubst shwordsplit nounset ksharrays exec </dev/null # ZLE closes stdin, which can cause errors diff --git a/Completion/Core/_path_files b/Completion/Core/_path_files index 26d2be6f3..8bb00bdf9 100644 --- a/Completion/Core/_path_files +++ b/Completion/Core/_path_files @@ -421,7 +421,7 @@ for prepath in "$prepaths[@]"; do # There are more components, so skip over the next components and make a # slash be added. - tmp1=( ${tmp1//(#b)([][()|*?^#~<>])/\\${match[1]}} ) + tmp1=( ${tmp1//(#b)([][()|*?^#~<>\\])/\\${match[1]}} ) tmp2="${(M)tpre##((.|..|)/)##}" if [[ -n "$tmp2" ]]; then skipped="/$tmp2" diff --git a/Completion/Core/compdump b/Completion/Core/compdump index ba65d1501..25df17fbf 100644 --- a/Completion/Core/compdump +++ b/Completion/Core/compdump @@ -14,7 +14,7 @@ # to see if auto-dump should re-dump the dump-file. emulate -L zsh -setopt extendedglob +setopt extendedglob noshglob typeset _d_file _d_f _d_bks _d_line _d_als _d_files |