diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2001-02-28 16:55:27 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2001-02-28 16:55:27 +0000 |
| commit | 43e41bcbc7008f51a0c902723ab48b39cffbf969 (patch) | |
| tree | 057abb017cf840205b73a8bad44d01bdca35cc16 | |
| parent | 9ccaaa40ebd86180166c9a9d837522ceac63b1c2 (diff) | |
| download | zsh-43e41bcbc7008f51a0c902723ab48b39cffbf969.tar.gz zsh-43e41bcbc7008f51a0c902723ab48b39cffbf969.tar.xz zsh-43e41bcbc7008f51a0c902723ab48b39cffbf969.zip | |
Use ksh-style deref of $_comp_options in case of ksharrays.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Completion/Commands/_bash_completions | 2 | ||||
| -rw-r--r-- | Completion/Commands/_complete_debug | 2 | ||||
| -rw-r--r-- | Completion/Commands/_complete_help | 2 | ||||
| -rw-r--r-- | Completion/Commands/_correct_word | 2 | ||||
| -rw-r--r-- | Completion/Commands/_expand_word | 2 | ||||
| -rw-r--r-- | Completion/Commands/_history_complete_word | 2 | ||||
| -rw-r--r-- | Completion/Commands/_next_tags | 2 |
8 files changed, 18 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 86e74c191..a6df57b74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-02-28 Bart Schaefer <schaefer@zsh.org> + + * users/3649: 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: Same as 13555 below, but for all + the other places where $_comp_options was referenced. + 2001-02-28 Oliver Kiddle <opk@zsh.org> * 13555: Completion/Core/_main_complete: handle ksh_arrays on the diff --git a/Completion/Commands/_bash_completions b/Completion/Commands/_bash_completions index f16b5e0a4..6980e8bfd 100644 --- a/Completion/Commands/_bash_completions +++ b/Completion/Commands/_bash_completions @@ -25,7 +25,7 @@ # that will not have been overridden, so you should add '~' to the # list of keys at the top of the for-loop. -setopt localoptions $_comp_options +setopt localoptions ${_comp_options[@]} local key=$KEYS[-1] expl diff --git a/Completion/Commands/_complete_debug b/Completion/Commands/_complete_debug index d013f00d9..acdb48fd8 100644 --- a/Completion/Commands/_complete_debug +++ b/Completion/Commands/_complete_debug @@ -1,6 +1,6 @@ #compdef -k complete-word \C-x? -setopt localoptions $_comp_options +setopt localoptions ${_comp_options[@]} setopt localtraps noerrexit ; trap - ZERR diff --git a/Completion/Commands/_complete_help b/Completion/Commands/_complete_help index 2d2ba52d9..593a2983e 100644 --- a/Completion/Commands/_complete_help +++ b/Completion/Commands/_complete_help @@ -1,7 +1,7 @@ #compdef -k complete-word \C-xh _complete_help() { - setopt localoptions $_comp_options + setopt localoptions ${_comp_options[@]} exec </dev/null # ZLE closes stdin, which can cause errors diff --git a/Completion/Commands/_correct_word b/Completion/Commands/_correct_word index c0b03dd02..11b37efb1 100644 --- a/Completion/Commands/_correct_word +++ b/Completion/Commands/_correct_word @@ -7,7 +7,7 @@ # If configurations keys with the prefix `correctword_' are # given they override those starting with `correct_'. -setopt localoptions $_comp_options +setopt localoptions ${_comp_options[@]} local curcontext="$curcontext" diff --git a/Completion/Commands/_expand_word b/Completion/Commands/_expand_word index 45173a4ba..48ce87ede 100644 --- a/Completion/Commands/_expand_word +++ b/Completion/Commands/_expand_word @@ -2,7 +2,7 @@ # Simple completion front-end implementing expansion. -setopt localoptions $_comp_options +setopt localoptions ${_comp_options[@]} local curcontext="$curcontext" diff --git a/Completion/Commands/_history_complete_word b/Completion/Commands/_history_complete_word index c15cd427b..48adb34bc 100644 --- a/Completion/Commands/_history_complete_word +++ b/Completion/Commands/_history_complete_word @@ -16,7 +16,7 @@ # range -- range of history words to complete _history_complete_word () { - setopt localoptions $_comp_options + setopt localoptions ${_comp_options[@]} local expl direction stop curcontext="$curcontext" local max slice hmax=$#historywords diff --git a/Completion/Commands/_next_tags b/Completion/Commands/_next_tags index 5d6b41e71..29196a14d 100644 --- a/Completion/Commands/_next_tags +++ b/Completion/Commands/_next_tags @@ -3,7 +3,7 @@ # Main widget. _next_tags() { - setopt localoptions $_comp_options + setopt localoptions ${_comp_options[@]} local ins ops="$PREFIX$SUFFIX" |