merge back changes from 4.1

1 files changed, 14 insertions, 0 deletions

diff --git a/Src/input.c b/Src/input.c
index 525a3202a..bf31c09cf 100644
--- a/Src/input.c
+++ b/Src/input.c
@@ -540,3 +540,17 @@ inpop(void)
 	inpoptop();
     } while (remcont);
 }
+
+/*
+ * Expunge any aliases from the input stack; they shouldn't appear
+ * in the history and need to be flushed explicitly when we encounter
+ * an error.
+ */
+
+/**/
+void
+inpopalias(void)
+{
+    while (inbufflags & INP_ALIAS)
+	inpoptop();
+}