diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2017-09-12 23:22:34 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2017-09-12 23:22:34 +0200 |
| commit | 4aaf06e6678dcead65d7226bd6bde3cffeb2cb2e (patch) | |
| tree | 5c8e2ac2c9a85e2e6568aed7120372e6efa074ac /Src/lex.c | |
| parent | f33de64abf57611e59df72da230f3d0d6760c4c5 (diff) | |
| parent | 6ff4787e830f8edb3a7e32490a88a131e4b62f7f (diff) | |
| download | zsh-4aaf06e6678dcead65d7226bd6bde3cffeb2cb2e.tar.gz zsh-4aaf06e6678dcead65d7226bd6bde3cffeb2cb2e.zip | |
Merge tag 'zsh-5.4.2' into debian
Release 5.4.2
Diffstat (limited to 'Src/lex.c')
| -rw-r--r-- | Src/lex.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -760,7 +760,7 @@ gettok(void) return AMPER; case LX1_BAR: d = hgetc(); - if (d == '|') + if (d == '|' && !incasepat) return DBAR; else if (d == '&') return BARAMP; @@ -1058,7 +1058,7 @@ gettokstr(int c, int sub) if (isset(SHGLOB)) { if (sub || in_brace_param) break; - if (incasepat && !lexbuf.len) + if (incasepat > 0 && !lexbuf.len) return INPAR; if (!isset(KSHGLOB) && lexbuf.len) goto brk; @@ -1859,7 +1859,7 @@ exalias(void) Reswd rw; hwend(); - if (interact && isset(SHINSTDIN) && !strin && !incasepat && + if (interact && isset(SHINSTDIN) && !strin && incasepat <= 0 && tok == STRING && !nocorrect && !(inbufflags & INP_ALIAS) && (isset(CORRECTALL) || (isset(CORRECT) && incmdpos))) spckword(&tokstr, 1, incmdpos, 1); |