mirrors
/
zsh
mirror of git://git.code.sf.net/p/zsh/code
1
0
Fork 0
Code Releases Activity

29744: don't mess up non '-A' cases in read -E fix

This commit is contained in:
Peter Stephenson 2011-08-29 17:21:39 +00:00
parent 557baa173c
commit a6de37ec2b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
2011-08-29 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 29744: Src/builtin.c: don't mess up non '-A' case in
29731.
2011-08-29 Barton E. Schaefer <schaefer@brasslantern.com>
* users/16291: Functions/Prompts/prompt_bart_setup: revert to
@ -15349,5 +15354,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5449 $
* $Revision: 1.5450 $
*****************************************************

9
Src/builtin.c
View File

@ -5549,7 +5549,14 @@ bin_read(char *name, char **args, Options ops, UNUSED(int func))
*bptr = '\0';
#endif
/* dispose of word appropriately */
if (OPT_ISSET(ops,'e')) {
if (OPT_ISSET(ops,'e') ||
/*
* When we're doing an array assignment, we'll
* handle echoing at that point. In all other
* cases (including -A with no assignment)
* we'll do it here.
*/
(OPT_ISSET(ops,'E') && !OPT_ISSET(ops,'A'))) {
zputs(buf, stdout);
putchar('\n');
}