From 3882c30f8087d21daf808ad2817dd8a58492de7a Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Sun, 2 Feb 2014 13:28:41 -0800 Subject: 32340: improve error messages for "read -c" / "read -l" --- Src/Zle/compctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Src/Zle/compctl.c') diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index ab1857c0a..2563095d8 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -193,7 +193,7 @@ compctlread(char *name, char **args, Options ops, char *reply) /* only allowed to be called for completion */ if (!incompctlfunc) { - zwarnnam(name, "option valid only in functions called for completion"); + zwarnnam(name, "option valid only in functions called via compctl"); return 1; } -- cgit v1.2.3 From 22ee3a4fd9698b221d10ecda501d7579132e95fc Mon Sep 17 00:00:00 2001 From: Miles Ohlrich Date: Mon, 4 Aug 2014 14:35:10 -0700 Subject: 32958: bitwise logic fix --- ChangeLog | 4 ++++ Src/Zle/compctl.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'Src/Zle/compctl.c') diff --git a/ChangeLog b/ChangeLog index 3b729c2d2..cceb5df50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-08-04 Barton E. Schaefer + + * Miles Ohlrich: 32958: Src/Zle/compctl.c: bitwise logic fix + 2014-08-04 Peter Stephenson * 32954: Doc/Zsh/expn.yo: missed this. diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index 2563095d8..52b9e9c82 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -3391,7 +3391,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) mflags |= CMF_FILE; for (n = firstnode(l); n; incnode(n)) addmatch(getdata(n), NULL); - mflags &= !CMF_FILE; + mflags &= ~CMF_FILE; } opts[NULLGLOB] = ng; } else { -- cgit v1.2.3