summaryrefslogtreecommitdiff
path: root/Src/Zle/compctl.c
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2010-12-14 10:35:38 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2010-12-14 10:35:38 +0000
commitebcead7543194819ef3bbd47ef384cabae3c59fc (patch)
tree6b5f55ab93d2b7a01aaa11dbb055e38173e3b70e /Src/Zle/compctl.c
parenteab4f9a83c74b104bcfa81d574d5f8f8a7a85ad3 (diff)
downloadzsh-ebcead7543194819ef3bbd47ef384cabae3c59fc.tar.gz
zsh-ebcead7543194819ef3bbd47ef384cabae3c59fc.zip
lexsave/lexrestore lexflags
add new LEXFLAGS_ZLE
Diffstat (limited to 'Src/Zle/compctl.c')
-rw-r--r--Src/Zle/compctl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Src/Zle/compctl.c b/Src/Zle/compctl.c
index 4e28fd67c..873d9287a 100644
--- a/Src/Zle/compctl.c
+++ b/Src/Zle/compctl.c
@@ -2789,10 +2789,10 @@ 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. */
- lexflags = LEXFLAGS_ACTIVE;
addedx = 1;
noerrs = 1;
lexsave();
+ lexflags = LEXFLAGS_ZLE;
tmp = (char *) zhalloc(tl = sl + 3 + strlen(s));
strcpy(tmp, ss);
tmp[sl] = ' ';
@@ -2843,7 +2843,7 @@ sep_comp_string(char *ss, char *s, int noffs)
noaliases = ona;
strinend();
inpop();
- errflag = lexflags = 0;
+ errflag = 0;
noerrs = ne;
lexrestore();
wb = owb;
@@ -3703,8 +3703,8 @@ 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. */
- lexflags = LEXFLAGS_ACTIVE;
lexsave();
+ lexflags = LEXFLAGS_ZLE;
tmpbuf = (char *)zhalloc(strlen(cc->str) + 5);
sprintf(tmpbuf, "foo %s", cc->str); /* KLUDGE! */
inpush(tmpbuf, 0, NULL);
@@ -3721,7 +3721,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd)
noaliases = ona;
strinend();
inpop();
- errflag = lexflags = 0;
+ errflag = 0;
lexrestore();
/* Fine, now do full expansion. */
prefork(foo, 0);