From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 9 Sep 2019 14:00:54 +0000 (-0400)
Subject: commit bash-20190906 snapshot
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad66335110980db1d1473918219efb5ac3f87b5e;p=thirdparty%2Fbash.git

commit bash-20190906 snapshot
---

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 489b87d98..67a00b975 100644
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -6523,3 +6523,10 @@ lib/readline/complete.c
 	  completion attempt failed and the current attempt returned a single
 	  match and insert the single completion here. A better implementation
 	  of Richard Stallman's suggestion of 2/23.
+
+				    9/3
+				    ---
+bashline.c
+	- edit_and_execute_command: reset the readahead token after calling
+	  restore_parser_state, in case some call to reset_parser set
+	  token_to_read. Fixes bug reported by null <avalonvales@protonmail.com>
diff --git a/bashline.c b/bashline.c
index dc976525b..209389786 100644
--- a/bashline.c
+++ b/bashline.c
@@ -1022,6 +1022,10 @@ edit_and_execute_command (count, c, editing_mode, edit_command)
   save_parser_state (&ps);
   r = parse_and_execute (command, (editing_mode == VI_EDITING_MODE) ? "v" : "C-xC-e", SEVAL_NOHIST);
   restore_parser_state (&ps);
+
+  /* if some kind of reset_parser was called, undo it. */
+  reset_readahead_token ();
+
   if (rl_prep_term_function)
     (*rl_prep_term_function) (metaflag);
 
diff --git a/builtins/evalstring.c b/builtins/evalstring.c
index 5b4000f5b..667ee5cce 100644
--- a/builtins/evalstring.c
+++ b/builtins/evalstring.c
@@ -440,8 +440,6 @@ parse_and_execute (string, from_file, flags)
 		}
 #endif /* ONESHOT */
 
-itrace("evalstring: command->type == %d but string = `%s'", command->type, bash_input.location.string);
-
 	      /* See if this is a candidate for $( <file ). */
 	      if (startup_state == 2 &&
 		  (subshell_environment & SUBSHELL_COMSUB) &&
diff --git a/support/copyright-script b/support/copyright-script
deleted file mode 100644
index e9f3fab05..000000000
--- a/support/copyright-script
+++ /dev/null
@@ -1,13 +0,0 @@
-#   This program is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
diff --git a/support/copyright-script b/support/copyright-script
new file mode 120000
index 000000000..9efbefcb1
--- /dev/null
+++ b/support/copyright-script
@@ -0,0 +1 @@
+copyright-makefile
\ No newline at end of file