summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Src/builtin.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a32773e4..4ce49d11b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-2013-05-21 Peter Stephenson <p.stephenson@samsung.com>
+2013-05-20 Barton Schaefer <schaefer@zsh.org>
- * Stephane: 31417: Functions/Calendar/age: needs --
- to protect againts files starting with -.
+ * 31416: Src/builtin.c: upon "read" of a short line, assign all
+ variables passed as arguments.
2013-05-14 Peter Stephenson <p.stephenson@samsung.com>
diff --git a/Src/builtin.c b/Src/builtin.c
index cd886437b..bc91578b3 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -5674,7 +5674,7 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
zputs(buf, stdout);
putchar('\n');
}
- if (!OPT_ISSET(ops,'e') && (*buf || first)) {
+ if (!OPT_ISSET(ops,'e') && (*buf || first || gotnl)) {
if (OPT_ISSET(ops,'A')) {
addlinknode(readll, buf);
al++;