diff options
| author | Oliver Kiddle <opk@zsh.org> | 2021-09-28 23:40:38 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2021-09-28 23:40:38 +0200 |
| commit | 0a8d5cdbc860444c77de5880f2ff181a8ae33a83 (patch) | |
| tree | 7953129c63689c1f4442730b29422b22ab7d5f65 | |
| parent | ca94d3acdaf30057c91b2f82f6268c3ffb2e3f6f (diff) | |
| download | zsh-0a8d5cdbc860444c77de5880f2ff181a8ae33a83.tar.gz zsh-0a8d5cdbc860444c77de5880f2ff181a8ae33a83.tar.xz zsh-0a8d5cdbc860444c77de5880f2ff181a8ae33a83.zip | |
49450: don't display explanation with compadd -x if any of -D, -A or -O are also used
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Zle/compcore.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index b1f295bd7..a84a66882 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-09-28 Oliver Kiddle <opk@zsh.org> + + * 49450: Src/Zle/compcore.c: don't display explanation with + compadd -x if any of -D, -A or -O are also used + 2021-09-26 Daniel Shahaf <d.s@daniel.shahaf.name> * unposted: Doc/Zsh/contrib.yo, Doc/Zsh/mod_curses.yo, diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 131e86825..63136854e 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -2120,7 +2120,7 @@ addmatches(Cadata dat, char **argv) curexpl->always = !!dat->mesg; curexpl->count = curexpl->fcount = 0; curexpl->str = dupstring(dat->mesg ? dat->mesg : dat->exp); - if (dat->mesg) + if (dat->mesg && !dat->dpar && !dat->opar && !dat->apar) addexpl(1); } else curexpl = NULL; |