mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-17 12:41:14 +02:00
Code Releases Activity

Fix "vared -e".

Browse source
This commit is contained in:
Bart Schaefer 2000-10-22 02:34:16 +00:00
parent 9bf7fb75c5
commit de595fbc90
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-10-21 Bart Schaefer <schaefer@zsh.org>
* 13057: Src/Zle/zle_main.c: `vared -h' should not imply `vared -e';
use of -e should override the setting of the IGNOREEOF option.
(The -e flag was added by zsh-workers/9396, for 3.1.6-dev-16.)
2000-10-20 Bart Schaefer <schaefer@zsh.org>
* 13055: Src/hist.c, Src/Zle/zle_main.c: Fix `vared -h' for non-

8
Src/Zle/zle_main.c
View file

@ -748,7 +748,7 @@ bin_vared(char *name, char **args, char *ops, int func)
struct value vbuf;
Value v;
Param pm = 0;
int create = 0, ifl;
int create = 0, ifl, ieof;
int type = PM_SCALAR, obreaks = breaks, haso = 0;
char *p1 = NULL, *p2 = NULL;
FILE *oshout = NULL;
@ -900,11 +900,13 @@ bin_vared(char *name, char **args, char *ops, int func)
varedarg = *args;
ifl = isfirstln;
if (ops['e'])
isfirstln = 1;
if (ops['h'])
hbegin(2);
isfirstln = ops['e'];
ieof = opts[IGNOREEOF];
opts[IGNOREEOF] = 0;
t = (char *) zleread(p1, p2, ops['h'] ? ZLRF_HISTORY : 0);
opts[IGNOREEOF] = ieof;
if (ops['h'])
hend(NULL);
isfirstln = ifl;