diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Completion/Commands/_bash_completions | 4 | ||||
| -rw-r--r-- | Completion/Commands/_complete_debug | 4 | ||||
| -rw-r--r-- | Completion/Commands/_complete_help | 4 | ||||
| -rw-r--r-- | Completion/Commands/_correct_word | 4 | ||||
| -rw-r--r-- | Completion/Commands/_expand_word | 4 | ||||
| -rw-r--r-- | Completion/Commands/_history_complete_word | 4 | ||||
| -rw-r--r-- | Completion/Commands/_next_tags | 4 | ||||
| -rw-r--r-- | Completion/Core/_main_complete | 4 |
9 files changed, 27 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index 4a680c505..f33db5a4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-10-05 Bart Schaefer <schaefer@zsh.org> + + * 12912: Completion/Commands/_bash_completions, + Completion/Commands/_complete_debug, + Completion/Commands/_complete_help, + Completion/Commands/_correct_word, + Completion/Commands/_expand_word, + Completion/Commands/_history_complete_word, + Completion/Commands/_next_tags, Completion/Core/_main_complete: + Other places where `unsetopt cshnullglob' is needed. + 2000-10-05 Sven Wischnowsky <wischnow@zsh.org> * 12901: Doc/Zsh/compwid.yo, Doc/Zsh/manual.yo: cleanup for 12896 diff --git a/Completion/Commands/_bash_completions b/Completion/Commands/_bash_completions index dd6998971..1c66bacf7 100644 --- a/Completion/Commands/_bash_completions +++ b/Completion/Commands/_bash_completions @@ -25,8 +25,8 @@ # that will not have been overridden, so you should add '~' to the # list of keys at the top of the for-loop. -setopt localoptions nullglob rcexpandparam extendedglob noshglob -unsetopt markdirs globsubst shwordsplit nounset ksharrays +setopt localoptions nullglob rcexpandparam extendedglob unset +unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob local key=$KEYS[-1] expl diff --git a/Completion/Commands/_complete_debug b/Completion/Commands/_complete_debug index c318d9a4f..bddc90313 100644 --- a/Completion/Commands/_complete_debug +++ b/Completion/Commands/_complete_debug @@ -1,7 +1,7 @@ #compdef -k complete-word \C-x? -setopt localoptions nullglob rcexpandparam extendedglob noshglob -unsetopt markdirs globsubst shwordsplit nounset ksharrays +setopt localoptions nullglob rcexpandparam extendedglob unset +unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob setopt localtraps noerrexit ; trap - ZERR diff --git a/Completion/Commands/_complete_help b/Completion/Commands/_complete_help index 9144ff991..0630ebe1f 100644 --- a/Completion/Commands/_complete_help +++ b/Completion/Commands/_complete_help @@ -1,8 +1,8 @@ #compdef -k complete-word \C-xh _complete_help() { - setopt localoptions nullglob rcexpandparam extendedglob noshglob - unsetopt markdirs globsubst shwordsplit nounset ksharrays + setopt localoptions nullglob rcexpandparam extendedglob unset + unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob exec </dev/null # ZLE closes stdin, which can cause errors local _sort_tags=_help_sort_tags text i j k diff --git a/Completion/Commands/_correct_word b/Completion/Commands/_correct_word index 9df2166c5..d027dc0e4 100644 --- a/Completion/Commands/_correct_word +++ b/Completion/Commands/_correct_word @@ -7,8 +7,8 @@ # If configurations keys with the prefix `correctword_' are # given they override those starting with `correct_'. -setopt localoptions nullglob rcexpandparam extendedglob noshglob -unsetopt markdirs globsubst shwordsplit nounset ksharrays +setopt localoptions nullglob rcexpandparam extendedglob unset +unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob local curcontext="$curcontext" diff --git a/Completion/Commands/_expand_word b/Completion/Commands/_expand_word index 4ff24c3f5..3ec3cc756 100644 --- a/Completion/Commands/_expand_word +++ b/Completion/Commands/_expand_word @@ -2,8 +2,8 @@ # Simple completion front-end implementing expansion. -setopt localoptions nullglob rcexpandparam extendedglob noshglob -unsetopt markdirs globsubst shwordsplit nounset ksharrays +setopt localoptions nullglob rcexpandparam extendedglob unset +unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob local curcontext="$curcontext" local -ah completers diff --git a/Completion/Commands/_history_complete_word b/Completion/Commands/_history_complete_word index db387daa7..d4b06c2d2 100644 --- a/Completion/Commands/_history_complete_word +++ b/Completion/Commands/_history_complete_word @@ -16,8 +16,8 @@ # range -- range of history words to complete _history_complete_word () { - setopt localoptions nullglob rcexpandparam extendedglob noshglob - unsetopt markdirs globsubst shwordsplit nounset ksharrays + setopt localoptions nullglob rcexpandparam extendedglob unset + unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob local expl direction stop curcontext="$curcontext" local max slice hmax=$#historywords diff --git a/Completion/Commands/_next_tags b/Completion/Commands/_next_tags index 22d833eea..f60302c37 100644 --- a/Completion/Commands/_next_tags +++ b/Completion/Commands/_next_tags @@ -3,8 +3,8 @@ # Main widget. _next_tags() { - setopt localoptions nullglob rcexpandparam extendedglob noshglob - unsetopt markdirs globsubst shwordsplit nounset ksharrays + setopt localoptions nullglob rcexpandparam extendedglob unset + unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob local ins ops="$PREFIX$SUFFIX" diff --git a/Completion/Core/_main_complete b/Completion/Core/_main_complete index 4d4fa1bff..893930f7d 100644 --- a/Completion/Core/_main_complete +++ b/Completion/Core/_main_complete @@ -16,8 +16,8 @@ # 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 noshglob \ - nomarkdirs noglobsubst noshwordsplit unset noksharrays nocshnullglob +setopt localoptions nullglob rcexpandparam extendedglob unset +unsetopt markdirs globsubst shwordsplit shglob ksharrays cshnullglob exec </dev/null # ZLE closes stdin, which can cause errors # Failed returns from this code are not real errors |