public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Chet Ramey <chet.ramey@case.edu>
Subject: [PATCH 2/4] fix problems moving back beyond start of history
Date: Sun, 14 Jun 2020 14:16:21 -0600	[thread overview]
Message-ID: <20200614201623.11743-3-tom@tromey.com> (raw)
In-Reply-To: <20200614201623.11743-1-tom@tromey.com>

From: Chet Ramey <chet.ramey@case.edu>

---
 readline/readline/misc.c     | 5 ++++-
 readline/readline/patchlevel | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/readline/readline/misc.c b/readline/readline/misc.c
index 64b1457d29e..42005b0c1ec 100644
--- a/readline/readline/misc.c
+++ b/readline/readline/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/readline/readline/patchlevel b/readline/readline/patchlevel
index fdf474049fc..7cbda82ded8 100644
--- a/readline/readline/patchlevel
+++ b/readline/readline/patchlevel
@@ -1,3 +1,3 @@
 # Do not edit -- exists only for use by patch
 
-1
+2
-- 
2.17.2


  parent reply	other threads:[~2020-06-14 20:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-14 20:16 [PATCH 0/4] Import readline 8.0 patches Tom Tromey
2020-06-14 20:16 ` [PATCH 1/4] Readline-8.0 patch 1: fix file descriptor leak with zero-length history file Tom Tromey
2020-06-14 20:16 ` Tom Tromey [this message]
2020-06-14 20:16 ` [PATCH 3/4] reading history entries with timestamps can result in joined entries Tom Tromey
2020-06-14 20:16 ` [PATCH 4/4] problems restoring the history file are not signaled correctly to the calling application Tom Tromey
2020-06-15 18:21 ` [PATCH 0/4] Import readline 8.0 patches Christian Biesinger
2020-06-30 21:19   ` Tom Tromey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200614201623.11743-3-tom@tromey.com \
    --to=tom@tromey.com \
    --cc=chet.ramey@case.edu \
    --cc=gdb-patches@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).