commit bash-20190906 snapshot

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>

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);
 

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) &&

support/copyright-script

@@ -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/>.
-#

support/copyright-script

@@ -0,0 +1 @@
+copyright-makefile