53 lines
1.3 KiB
Diff
53 lines
1.3 KiB
Diff
From d063aa6a54e670adeaa9b71385394dbf8dc9ff63 Mon Sep 17 00:00:00 2001
|
|
From: Chet Ramey <chet.ramey@case.edu>
|
|
Date: Fri, 7 Feb 2020 14:56:45 -0500
|
|
Subject: [PATCH 2/4] fix problems moving back beyond start of history
|
|
|
|
---
|
|
misc.c | 5 ++++-
|
|
patchlevel | 2 +-
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/misc.c b/misc.c
|
|
index 64b1457..42005b0 100644
|
|
--- a/misc.c
|
|
+++ b/misc.c
|
|
@@ -576,6 +576,7 @@ int
|
|
rl_get_previous_history (int count, int key)
|
|
{
|
|
HIST_ENTRY *old_temp, *temp;
|
|
+ int had_saved_line;
|
|
|
|
if (count < 0)
|
|
return (rl_get_next_history (-count, key));
|
|
@@ -588,6 +589,7 @@ rl_get_previous_history (int count, int key)
|
|
_rl_history_saved_point = (rl_point == rl_end) ? -1 : rl_point;
|
|
|
|
/* If we don't have a line saved, then save this one. */
|
|
+ had_saved_line = _rl_saved_line_for_history != 0;
|
|
rl_maybe_save_line ();
|
|
|
|
/* If the current line has changed, save the changes. */
|
|
@@ -611,7 +613,8 @@ rl_get_previous_history (int count, int key)
|
|
|
|
if (temp == 0)
|
|
{
|
|
- rl_maybe_unsave_line ();
|
|
+ if (had_saved_line == 0)
|
|
+ _rl_free_saved_history_line ();
|
|
rl_ding ();
|
|
}
|
|
else
|
|
diff --git a/patchlevel b/patchlevel
|
|
index fdf4740..7cbda82 100644
|
|
--- a/patchlevel
|
|
+++ b/patchlevel
|
|
@@ -1,3 +1,3 @@
|
|
# Do not edit -- exists only for use by patch
|
|
|
|
-1
|
|
+2
|
|
--
|
|
1.8.3.1
|
|
|