diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2010-12-14 09:59:04 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2010-12-14 09:59:04 +0000 |
| commit | eab4f9a83c74b104bcfa81d574d5f8f8a7a85ad3 (patch) | |
| tree | 90ce69fc60a966b5d31ad4700cbd84a72b3c2bed /Src/Zle/compctl.c | |
| parent | 5858e79f4d942ab13414f5efaf6f280bac690060 (diff) | |
| download | zsh-eab4f9a83c74b104bcfa81d574d5f8f8a7a85ad3.tar.gz zsh-eab4f9a83c74b104bcfa81d574d5f8f8a7a85ad3.zip | |
28528: Rearrange zleparse to lexflags
Add (z+n+)
Diffstat (limited to 'Src/Zle/compctl.c')
| -rw-r--r-- | Src/Zle/compctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c index f07f80877..4e28fd67c 100644 --- a/Src/Zle/compctl.c +++ b/Src/Zle/compctl.c @@ -2789,7 +2789,7 @@ sep_comp_string(char *ss, char *s, int noffs) /* Put the string in the lexer buffer and call the lexer to * * get the words we have to expand. */ - zleparse = 1; + lexflags = LEXFLAGS_ACTIVE; addedx = 1; noerrs = 1; lexsave(); @@ -2828,7 +2828,7 @@ sep_comp_string(char *ss, char *s, int noffs) addlinknode(foo, (p = ztrdup(tokstr))); else p = NULL; - if (!got && !zleparse) { + if (!got && !lexflags) { DPUTS(!p, "no current word in substr"); got = 1; cur = i; @@ -2843,7 +2843,7 @@ sep_comp_string(char *ss, char *s, int noffs) noaliases = ona; strinend(); inpop(); - errflag = zleparse = 0; + errflag = lexflags = 0; noerrs = ne; lexrestore(); wb = owb; @@ -3703,7 +3703,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) /* Put the string in the lexer buffer and call the lexer to * * get the words we have to expand. */ - zleparse = 1; + lexflags = LEXFLAGS_ACTIVE; lexsave(); tmpbuf = (char *)zhalloc(strlen(cc->str) + 5); sprintf(tmpbuf, "foo %s", cc->str); /* KLUDGE! */ @@ -3721,7 +3721,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd) noaliases = ona; strinend(); inpop(); - errflag = zleparse = 0; + errflag = lexflags = 0; lexrestore(); /* Fine, now do full expansion. */ prefork(foo, 0); |