From aecef41f2e47e738214cf6c55a383b4eae87902f Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 14 Sep 2023 13:57:07 +0200 Subject: 52142: Move _history_modifiers call to _parameter _parameters is used in many contexts, like assignments in command position, assignment after typeset, etc, where history modifiers are not valid. _brace_parameter already calls _history_modifiers explicitly so this seems more in line with that. --- ChangeLog | 6 ++++++ Completion/Zsh/Context/_parameter | 5 +++++ Completion/Zsh/Type/_parameters | 5 ----- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45cb416dc..978464688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-09-15 Mikael Magnusson + + * 52142: Completion/Zsh/Context/_parameter, + Completion/Zsh/Type/_parameters: Move _history_modifiers call + to _parameter + 2023-09-13 Jun-ichi Takimoto * 52122 + 52129: Src/subst.c, Test/D04parameter.ztst: fix (#) diff --git a/Completion/Zsh/Context/_parameter b/Completion/Zsh/Context/_parameter index 7e7788535..b08d665f5 100644 --- a/Completion/Zsh/Context/_parameter +++ b/Completion/Zsh/Context/_parameter @@ -1,3 +1,8 @@ #compdef -parameter- +if compset -P '*:'; then + _history_modifiers p + return +fi + _parameters -e diff --git a/Completion/Zsh/Type/_parameters b/Completion/Zsh/Type/_parameters index 7f6f33e0e..7b7692a3c 100644 --- a/Completion/Zsh/Type/_parameters +++ b/Completion/Zsh/Type/_parameters @@ -6,11 +6,6 @@ # If you specify a -g option with a pattern, the pattern will be used to # restrict the type of parameters matched. -if compset -P '*:'; then - _history_modifiers p - return -fi - local i pfilt local -i nm=$compstate[nmatches] local -a expl pattern=( -g \* ) normal described verbose faked fakes tmp -- cgit 1.4.1