diff options
| author | Oliver Kiddle <opk@zsh.org> | 2015-08-12 17:59:38 +0200 |
|---|---|---|
| committer | Oliver Kiddle <opk@zsh.org> | 2015-08-12 18:06:01 +0200 |
| commit | 4f509c6201968e1e283dbcf34a40a4cb2dea4267 (patch) | |
| tree | a1dec1a03546034977c8fd4e2e78d42c3fa15017 | |
| parent | f17eb26a34af69a2238a3d8b46079445e09c096e (diff) | |
| download | zsh-4f509c6201968e1e283dbcf34a40a4cb2dea4267.tar.gz zsh-4f509c6201968e1e283dbcf34a40a4cb2dea4267.tar.xz zsh-4f509c6201968e1e283dbcf34a40a4cb2dea4267.zip | |
36125: don't set history context in get-line
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/Zle/zle_hist.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 556a137da..468ba8f1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-08-12 Oliver Kiddle <opk@zsh.org> + * 36125: Src/Zle/zle_hist.c: don't set history context in get-line + * 35834 (tweaked): Src/Zle/zle_misc.c: strip a final newline from pasted text: inserting is hard to tell apart from accepting it diff --git a/Src/Zle/zle_hist.c b/Src/Zle/zle_hist.c index ffb7ce98f..c61b4ef0e 100644 --- a/Src/Zle/zle_hist.c +++ b/Src/Zle/zle_hist.c @@ -894,10 +894,8 @@ zgetline(UNUSED(char **args)) free(s); free(lineadd); clearlist = 1; - if (stackhist != -1) { - histline = stackhist; - stackhist = -1; - } + /* not restoring stackhist as we're inserting into current line */ + stackhist = -1; } return 0; } |