diff options
| author | Peter Stephenson <pws@zsh.org> | 2013-05-21 16:15:29 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2013-05-21 16:15:29 +0100 |
| commit | 17d38259f871d28ce92a36c7fa3dff0f269dee04 (patch) | |
| tree | caa3e74e820e257e5bc387361ccc40fac5564929 | |
| parent | 2989e4b66e5efc9a756f59a738f9de32bb4d62cf (diff) | |
| parent | 1182a75e1b4d46a42935a217e80a2955b76be1a5 (diff) | |
| download | zsh-17d38259f871d28ce92a36c7fa3dff0f269dee04.tar.gz zsh-17d38259f871d28ce92a36c7fa3dff0f269dee04.tar.xz zsh-17d38259f871d28ce92a36c7fa3dff0f269dee04.zip | |
Fix merge
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/builtin.c | 2 |
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++; |