diff options
author | Axel Beckert <abe@deuxchevaux.org> | 2012-01-22 16:22:20 +0100 |
---|---|---|
committer | Axel Beckert <abe@deuxchevaux.org> | 2012-01-22 16:22:20 +0100 |
commit | dbd9bc55f629891c29373398120d8af7e2c44732 (patch) | |
tree | 7a4f6a02ad876cdd236dbe6a8d68e172dc50a9e4 /Src/lex.c | |
parent | 1a3a8694a6eae1e140d746e4c21769cdd56971c0 (diff) | |
parent | 09532a70ead07a600a3d2258837d6e3fe943f2fd (diff) | |
download | zsh-dbd9bc55f629891c29373398120d8af7e2c44732.tar.gz zsh-dbd9bc55f629891c29373398120d8af7e2c44732.zip |
Merge branch 'upstream' into debian
Diffstat (limited to 'Src/lex.c')
-rw-r--r-- | Src/lex.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1857,7 +1857,8 @@ exalias(void) /* Then check for a reserved word */ if ((incmdpos || - (unset(IGNOREBRACES) && zshlextext[0] == '}' && !zshlextext[1])) && + (unset(IGNOREBRACES) && unset(IGNORECLOSEBRACES) && + zshlextext[0] == '}' && !zshlextext[1])) && (rw = (Reswd) reswdtab->getnode(reswdtab, zshlextext))) { tok = rw->token; if (tok == DINBRACK) |