summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@zsh.org>2023-05-11 12:37:52 -0700
committerBart Schaefer <schaefer@zsh.org>2023-05-11 12:37:52 -0700
commit8943b5e4505faec8d02e8535417491a87fc74d4e (patch)
tree72174602fdc6b05ec3d38be5806b33e5245da873
parentf376f95c47202fb1c00f41577347e25ed5d37439 (diff)
downloadzsh-8943b5e4505faec8d02e8535417491a87fc74d4e.tar.gz
zsh-8943b5e4505faec8d02e8535417491a87fc74d4e.zip
users/29070: clean up tokens in cmdstr before compctl completion
-rw-r--r--ChangeLog3
-rw-r--r--Src/Zle/zle_tricky.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d91ca40b6..130a37b8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2023-05-11 Bart Schaefer <schaefer@zsh.org>
+ * users/29070: Src/Zle/zle_tricky.c: clean up tokens in cmdstr
+ before attempting completion (compctl only)
+
* Jim <linux.tech.guy@gmail.com>: 51609: Doc/Zsh/mod_zselect.yo:
fix reference to select(2)
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 690cf6efb..6ceb5d87f 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1315,6 +1315,8 @@ get_comp_string(void)
ins = (tok == REPEAT ? 2 : (tok != STRING && tok != TYPESET));
zsfree(cmdstr);
cmdstr = ztrdup(tokstr);
+ untokenize(cmdstr);
+ remnulargs(cmdstr);
cmdtok = tok;
/*
* If everything before is a redirection, or anything