32340: improve error messages for "read -c" / "read -l"

3 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 96cf0e9f8..1515bd34e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-02-02  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 32340: Src/init.c, Src/Zle/compctl.c:  Add specifics to error
+	messages explaining failure of "read -c" / "read -l".
+
 	* 32338: Doc/Makefile.in: create Doc/help.txt as an empty file
 	when Util/helpfiles fails, so that the rest of the build does not
 	yeild a spurious error
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;
     }
 
diff --git a/Src/init.c b/Src/init.c
index f5aae71f2..bd871cbbd 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -1535,7 +1535,7 @@ mod_export CompctlReadFn compctlreadptr = fallback_compctlread;
 mod_export int
 fallback_compctlread(char *name, UNUSED(char **args), UNUSED(Options ops), UNUSED(char *reply))
 {
-    zwarnnam(name, "option valid only in functions called from completion");
+    zwarnnam(name, "no loaded module provides read for completion context");
     return 1;
 }