aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@zsh.org>2022-05-07 16:54:31 -0700
committerBart Schaefer <schaefer@zsh.org>2022-05-07 16:54:31 -0700
commit67d9a47d79a4265b98e0cc3dd3e6840030818489 (patch)
treeebcac46b96c1d6276e4d9d3bda9138630e3c431b
parent44829c19e85980d19424e4ebec4b10f1f14a0526 (diff)
downloadzsh-67d9a47d79a4265b98e0cc3dd3e6840030818489.tar.gz
zsh-67d9a47d79a4265b98e0cc3dd3e6840030818489.tar.xz
zsh-67d9a47d79a4265b98e0cc3dd3e6840030818489.zip
50184: fix inclusion of -S separator in -r options passed to compadd through _describe
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Base/Utility/_values2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a995baf4..efc9bdb1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2022-05-07 Bart Schaefer <schaefer@zsh.org>
+ * 50184: Completion/Base/Utility/_values: fix inclusion of -S
+ separator in -r options passed to compadd through _describe
+
* Marlon Richert: 49954: Completion/Unix/Command/_gradle: improve
handling of task names, subprojects, completion tags, and caching
diff --git a/Completion/Base/Utility/_values b/Completion/Base/Utility/_values
index 688ada848..5ed79e890 100644
--- a/Completion/Base/Utility/_values
+++ b/Completion/Base/Utility/_values
@@ -60,7 +60,7 @@ if compvalues -i "$keep[@]" "$@"; then
_describe "$descr" \
noargs "$sep[@]" -M 'r:|[_-]=* r:|=*' -- \
args -S "${argsep}" -M 'r:|[_-]=* r:|=*' -- \
- opts -qS "${argsep}" -r "${argsep}${sep} \\t\\n\\-" -M 'r:|[_-]=* r:|=*'
+ opts -qS "${argsep}" -r "${argsep}${sep[2]} \\t\\n\\-" -M 'r:|[_-]=* r:|=*'
curcontext="$oldcontext"