diff options
| author | Frank Terbeck <ft@bewatermyfriend.org> | 2011-12-01 10:02:04 +0100 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2011-12-01 10:02:04 +0100 |
| commit | d8da5ea2f2bc5f837d0b364fff2636ebdb2f90ca (patch) | |
| tree | 9fd9a57486ac4702608d92088ffd91f52971244f /Src/glob.c | |
| parent | af2bb4fdb09414d21922d3fafe4e3a0ac1332f01 (diff) | |
| parent | 9d71f4c207fb34e8d64af0443c83231b1cc3b494 (diff) | |
| download | zsh-d8da5ea2f2bc5f837d0b364fff2636ebdb2f90ca.tar.gz zsh-d8da5ea2f2bc5f837d0b364fff2636ebdb2f90ca.zip | |
Merge commit 'zsh-4.3.13' into debian
Diffstat (limited to 'Src/glob.c')
| -rw-r--r-- | Src/glob.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Src/glob.c b/Src/glob.c index bfc7f0416..cf4a5a537 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -1801,7 +1801,7 @@ zglob(LinkList list, LinkNode np, int nountok) Eprog prog; if ((prog = parse_string(sortp->exec, 0))) { - int ef = errflag, lv = lastval, ret; + int ef = errflag, lv = lastval; /* Parsed OK, execute for each name */ for (tmpptr = matchbuf; tmpptr < matchptr; tmpptr++) { @@ -1814,7 +1814,6 @@ zglob(LinkList list, LinkNode np, int nountok) tmpptr->sortstrs[iexec] = tmpptr->name; } - ret = lastval; errflag = ef; lastval = lv; } else { |