diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-10-01 09:44:56 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-10-01 09:44:56 +0100 |
| commit | 8877783b2f98de67144f403e0146b6d201e98ba3 (patch) | |
| tree | c8fe6c4d4fc6d7c93119c01cc300427655001ba3 /Src/Zle/zle_main.c | |
| parent | 007f249a8e190306a9ef6bca2317e79004ace871 (diff) | |
| parent | bc2e73ba4c27a220a6f122cb7b9b5c6fa9996941 (diff) | |
| download | zsh-8877783b2f98de67144f403e0146b6d201e98ba3.tar.gz zsh-8877783b2f98de67144f403e0146b6d201e98ba3.tar.xz zsh-8877783b2f98de67144f403e0146b6d201e98ba3.zip | |
Merge branch 'master' of https://git.code.sf.net/p/zsh/code
Diffstat (limited to 'Src/Zle/zle_main.c')
| -rw-r--r-- | Src/Zle/zle_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index 992f152df..593d636cc 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -1402,7 +1402,8 @@ execzlefunc(Thingy func, char **args, int set_bindk) opts[XTRACE] = oxt; sfcontext = osc; endparamscope(); - lastcmd = 0; + lastcmd = w->flags; + w->flags = 0; r = 1; redup(osi, 0); } @@ -1981,7 +1982,7 @@ zle_main_entry(int cmd, va_list ap) static struct builtin bintab[] = { BUILTIN("bindkey", 0, bin_bindkey, 0, -1, 0, "evaM:ldDANmrsLRp", NULL), BUILTIN("vared", 0, bin_vared, 1, 1, 0, "aAcef:hi:M:m:p:r:t:", NULL), - BUILTIN("zle", 0, bin_zle, 0, -1, 0, "aAcCDFgGIKlLmMNrRTUw", NULL), + BUILTIN("zle", 0, bin_zle, 0, -1, 0, "aAcCDfFgGIKlLmMNrRTUw", NULL), }; /* The order of the entries in this table has to match the *HOOK |