Petr Šabata 33fc6c
From 8b6524c482573ea12eb20be756cdb8ca31d945f3 Mon Sep 17 00:00:00 2001
Petr Šabata 33fc6c
From: Chet Ramey <chet.ramey@case.edu>
Petr Šabata 33fc6c
Date: Fri, 7 Feb 2020 15:18:41 -0500
Petr Šabata 33fc6c
Subject: [PATCH] Bash-5.0 patch 14: edit-and-execute-command does not handle
Petr Šabata 33fc6c
 empty command lines
Petr Šabata 33fc6c
Petr Šabata 33fc6c
---
Petr Šabata 33fc6c
 bashline.c   | 7 ++-----
Petr Šabata 33fc6c
 patchlevel.h | 2 +-
Petr Šabata 33fc6c
 2 files changed, 3 insertions(+), 6 deletions(-)
Petr Šabata 33fc6c
Petr Šabata 33fc6c
diff --git a/bashline.c b/bashline.c
Petr Šabata 33fc6c
index 824ea9d9..97adaa0f 100644
Petr Šabata 33fc6c
--- a/bashline.c
Petr Šabata 33fc6c
+++ b/bashline.c
Petr Šabata 33fc6c
@@ -961,11 +961,8 @@ edit_and_execute_command (count, c, editing_mode, edit_command)
Petr Šabata 33fc6c
       /* This breaks down when using command-oriented history and are not
Petr Šabata 33fc6c
 	 finished with the command, so we should not ignore the last command */
Petr Šabata 33fc6c
       using_history ();
Petr Šabata 33fc6c
-      if (rl_line_buffer[0])
Petr Šabata 33fc6c
-	{
Petr Šabata 33fc6c
-	  current_command_line_count++;	/* for rl_newline above */
Petr Šabata 33fc6c
-	  bash_add_history (rl_line_buffer);
Petr Šabata 33fc6c
-	}
Petr Šabata 33fc6c
+      current_command_line_count++;	/* for rl_newline above */
Petr Šabata 33fc6c
+      bash_add_history (rl_line_buffer);
Petr Šabata 33fc6c
       current_command_line_count = 0;	/* for dummy history entry */
Petr Šabata 33fc6c
       bash_add_history ("");
Petr Šabata 33fc6c
       history_lines_this_session++;
Petr Šabata 33fc6c
diff --git a/patchlevel.h b/patchlevel.h
Petr Šabata 33fc6c
index 779671cd..09a3cc84 100644
Petr Šabata 33fc6c
--- a/patchlevel.h
Petr Šabata 33fc6c
+++ b/patchlevel.h
Petr Šabata 33fc6c
@@ -25,6 +25,6 @@
Petr Šabata 33fc6c
    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
Petr Šabata 33fc6c
    looks for to find the patch level (for the sccs version string). */
Petr Šabata 33fc6c
 
Petr Šabata 33fc6c
-#define PATCHLEVEL 13
Petr Šabata 33fc6c
+#define PATCHLEVEL 14
Petr Šabata 33fc6c
 
Petr Šabata 33fc6c
 #endif /* _PATCHLEVEL_H_ */
Petr Šabata 33fc6c
-- 
Petr Šabata 33fc6c
2.25.1
Petr Šabata 33fc6c