diff options
Diffstat (limited to 'Src/Zle')
| -rw-r--r-- | Src/Zle/compcore.c | 4 | ||||
| -rw-r--r-- | Src/Zle/compctl.c | 8 | ||||
| -rw-r--r-- | Src/Zle/zle_tricky.c | 7 |
3 files changed, 9 insertions, 10 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 2e983f62c..c59815874 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -1481,13 +1481,13 @@ set_comp_sep(void) /* Put the string in the lexer buffer and call the lexer to * * get the words we have to expand. */ - lexflags = LEXFLAGS_ACTIVE; ocs = zlemetacs; oll = zlemetall; ol = zlemetaline; addedx = 1; noerrs = 1; lexsave(); + lexflags = LEXFLAGS_ZLE; /* * tl is the length of the temporary string including * the space at the start and the x at the cursor position, @@ -1634,7 +1634,7 @@ set_comp_sep(void) noaliases = ona; strinend(); inpop(); - errflag = lexflags = 0; + errflag = 0; noerrs = ne; lexrestore(); wb = owb; 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); diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c index 9a63b2738..566537761 100644 --- a/Src/Zle/zle_tricky.c +++ b/Src/Zle/zle_tricky.c @@ -1140,9 +1140,9 @@ get_comp_string(void) zsfree(varname); varname = NULL; insubscr = 0; - lexflags = LEXFLAGS_ACTIVE; clwpos = -1; lexsave(); + lexflags = LEXFLAGS_ZLE; inpush(dupstrspace(linptr), 0, NULL); strinbeg(0); wordpos = tt0 = cp = rd = ins = oins = linarr = parct = ia = redirpos = 0; @@ -2707,7 +2707,6 @@ doexpandhist(void) noaliases = ona; strinend(); inpop(); - lexflags = 0; lexrestore(); expanding = 0; @@ -2807,8 +2806,8 @@ getcurcmd(void) int curlincmd; char *s = NULL; - lexflags = LEXFLAGS_ACTIVE; lexsave(); + lexflags = LEXFLAGS_ZLE; metafy_line(); inpush(dupstrspace(zlemetaline), 0, NULL); strinbeg(1); @@ -2829,7 +2828,7 @@ getcurcmd(void) popheap(); strinend(); inpop(); - errflag = lexflags = 0; + errflag = 0; unmetafy_line(); lexrestore(); |