commit bash-20190906 snapshot

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 489b87d98e9c618fe33699a1d996cb23c868dae0..67a00b975d9ec62f52fe5f3197a2ce530dc457be 100644 (file)
--- 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 dc976525b4dc52bbb838a4fc739267fbde39f574..209389786e6dfd079b7e729f92ac612c38b404ce 100644 (file)
--- 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 5b4000f5b494dab20ff73263a88d2a63d9d20d87..667ee5cce2de91a0bcce8e6f0fe56ac3af9393a9 100644 (file)
--- 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 (file)
index e9f3fab05f1cb674740d4a1c3d3dee66e66e5d31..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..9efbefcb1258e09b882d0c5939f06c258a7a681b
--- /dev/null
+++ b/support/copyright-script
@@ -0,0 +1 @@
+copyright-makefile
\ No newline at end of file