--- a/dist-files.mk	Wed Jun 24 10:15:46 2020 -0400
+++ b/dist-files.mk	Sun Jun 28 15:41:14 2020 +0200
@@ -616,6 +616,10 @@
   qwt.mk \
   qwtplot3d-1-fixes.patch \
   qwtplot3d.mk \
+  readline-0-001.patch \
+  readline-0-002.patch \
+  readline-0-003.patch \
+  readline-0-004.patch \
   readline-1-display.patch \
   readline-1-fixes.patch \
   readline-1-input.patch \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/readline-0-001.patch	Sun Jun 28 15:41:14 2020 +0200
@@ -0,0 +1,32 @@
+			   READLINE PATCH REPORT
+			   =====================
+
+Readline-Release: 8.0
+Patch-ID: readline80-001
+
+Bug-Reported-by:	chet.ramey@case.edu
+Bug-Reference-ID:
+Bug-Reference-URL:
+
+Bug-Description:
+
+The history file reading code doesn't close the file descriptor open to
+the history file when it encounters a zero-length file.
+
+diff --git "a/histfile.c" "b/histfile.c"
+--- a/histfile.c	2018-06-11 09:14:52.000000000 -0400
++++ b/histfile.c	2019-05-16 15:55:57.000000000 -0400
+@@ -306,4 +306,5 @@
+     {
+       free (input);
++      close (file);
+       return 0;	/* don't waste time if we don't have to */
+     }
+diff --git "a/patchlevel" "b/patchlevel"
+--- a/patchlevel	2013-11-15 08:11:11.000000000 -0500
++++ b/patchlevel	2014-03-21 08:28:40.000000000 -0400
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-0
++1

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/readline-0-002.patch	Sun Jun 28 15:41:14 2020 +0200
@@ -0,0 +1,46 @@
+			   READLINE PATCH REPORT
+			   =====================
+
+Readline-Release: 8.0
+Patch-ID: readline80-002
+
+Bug-Reported-by:	lessbug@qq.com
+Bug-Reference-ID:	<tencent_6AA531D9A5CC4121D86BD5CDA2E0DA98C605@qq.com>
+Bug-Reference-URL:
+
+Bug-Description:
+
+When using previous-history to go back beyond the beginning of the history list,
+it's possible to move to an incorrect partial line.
+
+diff --git "a/misc.c" "b/misc.c"
+--- a/misc.c	2017-07-07 17:30:12.000000000 -0400
++++ b/misc.c	2019-05-16 11:43:46.000000000 -0400
+@@ -577,4 +577,5 @@
+ {
+   HIST_ENTRY *old_temp, *temp;
++  int had_saved_line;
+ 
+   if (count < 0)
+@@ -589,4 +590,5 @@
+ 
+   /* 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 ();
+ 
+@@ -612,5 +614,6 @@
+   if (temp == 0)
+     {
+-      rl_maybe_unsave_line ();
++      if (had_saved_line == 0)
++        _rl_free_saved_history_line ();
+       rl_ding ();
+     }
+diff --git "a/patchlevel" "b/patchlevel"
+--- a/patchlevel	2013-11-15 08:11:11.000000000 -0500
++++ b/patchlevel	2014-03-21 08:28:40.000000000 -0400
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-1
++2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/readline-0-003.patch	Sun Jun 28 15:41:14 2020 +0200
@@ -0,0 +1,54 @@
+			   READLINE PATCH REPORT
+			   =====================
+
+Readline-Release: 8.0
+Patch-ID: readline80-003
+
+Bug-Reported-by:	HIROSE Masaaki <hirose31@gmail.com>
+Bug-Reference-ID:	<CAGSOfA-RqiTe=+GsXsDKyZrrMWH4bDbXgMVVegMa6OjqC5xbnQ@mail.gmail.com>
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-bash/2019-05/msg00038.html
+
+Bug-Description:
+
+Reading history entries with timestamps can result in history entries joined
+by linefeeds.
+
+diff --git "a/histfile.c" "b/histfile.c"
+--- a/histfile.c	2018-06-11 09:14:52.000000000 -0400
++++ b/histfile.c	2019-05-16 15:55:57.000000000 -0400
+@@ -370,7 +370,9 @@
+ 
+   has_timestamps = HIST_TIMESTAMP_START (buffer);
+-  history_multiline_entries += has_timestamps && history_write_timestamps;  
++  history_multiline_entries += has_timestamps && history_write_timestamps;
+ 
+   /* Skip lines until we are at FROM. */
++  if (has_timestamps)
++    last_ts = buffer;
+   for (line_start = line_end = buffer; line_end < bufend && current_line < from; line_end++)
+     if (*line_end == '\n')
+@@ -381,5 +383,16 @@
+ 	if (HIST_TIMESTAMP_START(p) == 0)
+ 	  current_line++;
++	else
++	  last_ts = p;
+ 	line_start = p;
++	/* If we are at the last line (current_line == from) but we have
++	   timestamps (has_timestamps), then line_start points to the
++	   text of the last command, and we need to skip to its end. */
++	if (current_line >= from && has_timestamps)
++	  {
++	    for (line_end = p; line_end < bufend && *line_end != '\n'; line_end++)
++	      ;
++	    line_start = (*line_end == '\n') ? line_end + 1 : line_end;
++	  }
+       }
+ 
+diff --git "a/patchlevel" "b/patchlevel"
+--- a/patchlevel	2013-11-15 08:11:11.000000000 -0500
++++ b/patchlevel	2014-03-21 08:28:40.000000000 -0400
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-2
++3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/readline-0-004.patch	Sun Jun 28 15:41:14 2020 +0200
@@ -0,0 +1,39 @@
+			   READLINE PATCH REPORT
+			   =====================
+
+Readline-Release: 8.0
+Patch-ID: readline80-004
+
+Bug-Reported-by:	auroralanes@protonmail.ch
+Bug-Reference-ID:	<WikEDKluAyoha9IDLp83rbN7_Uinr2rrpvSV_z4wmt9qur9piN-FNOn17P0cAizEVah1Fvc9d641vIIWX_7SC6EUTz0CatnOH-C-UK3rPYc=@protonmail.ch>
+Bug-Reference-URL:	https://lists.gnu.org/archive/html/bug-readline/2020-01/msg00008.html
+
+Bug-Description:
+
+If writing the history file fails, and renaming the backup history file fails,
+it's possible for readline's history code to return the wrong error to its
+caller.
+
+diff --git "a/histfile.c" "b/histfile.c"
+--- a/histfile.c	2019-11-19 10:31:58.000000000 -0500
++++ b/histfile.c	2020-02-01 16:28:29.000000000 -0500
+@@ -621,4 +621,5 @@
+   if (rv != 0)
+     {
++      rv = errno;
+       if (tempname)
+ 	unlink (tempname);
+@@ -768,4 +769,5 @@
+   if (rv != 0)
+     {
++      rv = errno;
+       if (tempname)
+ 	unlink (tempname);
+diff --git "a/patchlevel" "b/patchlevel"
+--- a/patchlevel	2013-11-15 08:11:11.000000000 -0500
++++ b/patchlevel	2014-03-21 08:28:40.000000000 -0400
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-3
++4