From 8f8b82bc6c7ecc22bca90d624fc65e3499e43113 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Fri, 24 Jul 2015 10:19:00 +0100
Subject: 35883: Don't attempt to back up over history if expanding alias

---
 Src/hist.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Src')

diff --git a/Src/hist.c b/Src/hist.c
index cf224cb4e..75e809c48 100644
--- a/Src/hist.c
+++ b/Src/hist.c
@@ -906,7 +906,8 @@ ihungetc(int c)
     while (!lexstop && !errflag) {
 	if (hptr[-1] != (char) c && stophist < 4 &&
 	    hptr > chline + 1 && hptr[-1] == '\n' && hptr[-2] == '\\' &&
-	    !(histactive & HA_UNGET)) {
+	    !(histactive & HA_UNGET) &&
+	    (inbufflags & (INP_ALIAS|INP_HIST)) != INP_ALIAS) {
 	    histactive |= HA_UNGET;
 	    hungetc('\n');
 	    hungetc('\\');
-- 
cgit 1.4.1