diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2013-11-07 14:52:31 +0100 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2013-11-07 14:52:31 +0100 |
| commit | d799ac78a744a5359563af55b4dee9e91255a1dc (patch) | |
| tree | 73475ed7089e6ee050085a96b88018994b43bdfc /Src/Zle/compcore.c | |
| parent | abfb3b136a4ad5b2832fb7d920442a2bb28c0697 (diff) | |
| parent | 375115c7dfd6dff576915d25fe2ecdd381dd9d81 (diff) | |
| download | zsh-d799ac78a744a5359563af55b4dee9e91255a1dc.tar.gz zsh-d799ac78a744a5359563af55b4dee9e91255a1dc.zip | |
Merge branch 'upstream' into debian
Diffstat (limited to 'Src/Zle/compcore.c')
| -rw-r--r-- | Src/Zle/compcore.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 39d41bdb5..5c5628a8d 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -826,7 +826,6 @@ callcompfunc(char *s, char *fn) sfcontext = SFC_CWIDGET; NEWHEAPS(compheap) { LinkList largs = NULL; - int olv = lastval; if (*cfargs) { char **p = cfargs; @@ -836,9 +835,7 @@ callcompfunc(char *s, char *fn) while (*p) addlinknode(largs, dupstring(*p++)); } - doshfunc(shfunc, largs, 0); - cfret = lastval; - lastval = olv; + cfret = doshfunc(shfunc, largs, 1); } OLDHEAPS; sfcontext = osc; endparamscope(); |