summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2014-01-19 17:38:15 -0800
committerBarton E. Schaefer <schaefer@zsh.org>2014-01-19 17:38:15 -0800
commit4777c07c8eadd49a51e4a719b969a0d2aa60906f (patch)
treef6a54e9d3130de64b467e7d0091b27203ecf1973
parent23f98c3e1d4792e32c616e1f73c383988bd86a9c (diff)
downloadzsh-4777c07c8eadd49a51e4a719b969a0d2aa60906f.tar.gz
zsh-4777c07c8eadd49a51e4a719b969a0d2aa60906f.zip
users/18335: avoid passing to "functions" those typeset options that it does not accept
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Zsh/Command/_typeset4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 96a95ea77..52b4fb7aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-19 Barton E. Schaefer <schaefer@zsh.org>
+
+ * users/18335: Completion/Zsh/Command/_typeset: avoid passing to
+ "functions" those typeset options that it does not accept
+
2014-01-18 Barton E. Schaefer <schaefer@zsh.org>
* 32285: Src/mem.c (freeheap): when the last-arena-with-free-space
diff --git a/Completion/Zsh/Command/_typeset b/Completion/Zsh/Command/_typeset
index 0920e3fb5..f876e1beb 100644
--- a/Completion/Zsh/Command/_typeset
+++ b/Completion/Zsh/Command/_typeset
@@ -91,13 +91,13 @@ if [[ "$state" = vars_eq ]]; then
_wanted functions expl 'shell function' compadd -a args
elif [[ -n $onopts$offopts ]]; then
if [[ -n $offopts ]]; then
- args=(${(f)"$(functions +$offopts)"})
+ args=(${(f)"$(functions +${offopts//[^UXkmtTuz]/})"})
else
args=(${(k)functions})
fi
if [[ -n $onopts ]]; then
local -a funckeys
- funckeys=(${(f)"$(functions +$onopts)"})
+ funckeys=(${(f)"$(functions +${onopts//[^UXkmtTuz]/})"})
args=(${args:|funckeys})
fi
if zstyle -t ":completion:${curcontext}:functions" prefix-needed &&