From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 17 Mar 2024 11:35:53 +0000 (+0100)
Subject: Merge topic branch t/misc into pu
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=83c4cb37c39f01d038c808132a6ec990a0c75aa3;hp=33871219f2e65e10d7f0144d3bb26cc93bb25018;p=paraslash.git

Merge topic branch t/misc into pu

The stuff in here is too small to get its own topic branch. The
commits are generally regarded as safe enough to be applied directly to
"master" without cooking in "next" first. However, if a commit induces
a merge conflict or is important enough to get mentioned in an item
of the NEWS file, the commit should get a dedicated topic branch.

Unlike most other topic branches, this branch never promotes to
"next". When a set of commits is ready to graduate to "master", the
branch is rebased onto "master" and its commits are re-ordered so that
the graduating commits appear at the beginning. The last such commit
is merged to "master". This always results in a fast-forward merge,
so no merge message needs to be supplied.

* refs/heads/t/misc:
  i9e: Clear history on close.
---

diff --git a/interactive.c b/interactive.c
index 1376cf1d..4d48742f 100644
--- a/interactive.c
+++ b/interactive.c
@@ -229,6 +229,7 @@ void i9e_close(void)
 	rl_callback_handler_remove();
 	if (hf)
 		write_history(hf);
+	clear_history();
 	wipe_bottom_line();
 	fcntl(i9ep->ici->fds[0], F_SETFL, i9ep->fd_flags[0]);
 	fcntl(i9ep->ici->fds[1], F_SETFL, i9ep->fd_flags[1]);