mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-12-29 16:25:35 +01:00
Merge branch 'master' of git://git.code.sf.net/p/zsh/code
Conflicts: ChangeLog
This commit is contained in:
commit
7d2912de04
2 changed files with 7 additions and 2 deletions
|
@ -3,6 +3,11 @@
|
|||
* 33042: NEWS, Src/jobs.c: $? and $pipestatus report 128+signal
|
||||
number for stopped jobs as well as terminated jobs
|
||||
|
||||
2014-08-21 Mikael Magnusson <mikachu@gmail.com>
|
||||
|
||||
* 33038: Src/glob.c: Fix {a..b} expansion hanging when either
|
||||
endpoint is a literal NUL character
|
||||
|
||||
2014-08-20 Barton E. Schaefer <schaefer@zsh.org>
|
||||
|
||||
* Lokesh Mandvekar: 33032: Completion/Linux/Command/_docker,
|
||||
|
|
|
@ -2219,7 +2219,7 @@ xpandbraces(LinkList list, LinkNode *np)
|
|||
uremnode(list, node);
|
||||
strp = str - str3;
|
||||
lenalloc = strp + strlen(str2+1) + 1;
|
||||
for (; cend >= cstart; cend--) {
|
||||
do {
|
||||
#ifdef MULTIBYTE_SUPPORT
|
||||
char *ncptr;
|
||||
int nclen;
|
||||
|
@ -2239,7 +2239,7 @@ xpandbraces(LinkList list, LinkNode *np)
|
|||
insertlinknode(list, last, p);
|
||||
if (rev) /* decreasing: add in reverse order. */
|
||||
last = nextnode(last);
|
||||
}
|
||||
} while (cend-- > cstart);
|
||||
*np = nextnode(olast);
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue