From 4f509c6201968e1e283dbcf34a40a4cb2dea4267 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@zsh.org>
Date: Wed, 12 Aug 2015 17:59:38 +0200
Subject: 36125: don't set history context in get-line

---
 Src/Zle/zle_hist.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Src/Zle/zle_hist.c')

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;
 }
-- 
cgit 1.4.1