summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2011-11-22 20:01:00 -0500
committerChet Ramey <chet.ramey@case.edu>2011-11-22 20:01:00 -0500
commit680d15e19f2b8f7b6ee1535f923e7be6a95c4358 (patch)
tree626bfcadf4e728bd073977fb5d81b063d7884578
parent7aaa661d31d0a6b12f5efab1f2b9d1729efca308 (diff)
downloadbash-680d15e19f2b8f7b6ee1535f923e7be6a95c4358.tar.gz
Bash-4.2 patch 10
-rw-r--r--patchlevel.h2
-rw-r--r--print_cmd.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/patchlevel.h b/patchlevel.h
index e7410c42..69439cb5 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */
-#define PATCHLEVEL 9
+#define PATCHLEVEL 10
#endif /* _PATCHLEVEL_H_ */
diff --git a/print_cmd.c b/print_cmd.c
index 0d646ec5..cd54b2f7 100644
--- a/print_cmd.c
+++ b/print_cmd.c
@@ -315,6 +315,7 @@ make_command_string_internal (command)
cprintf ("( ");
skip_this_indent++;
make_command_string_internal (command->value.Subshell->command);
+ PRINT_DEFERRED_HEREDOCS ("");
cprintf (" )");
break;
@@ -592,6 +593,7 @@ print_arith_for_command (arith_for_command)
newline ("do\n");
indentation += indentation_amount;
make_command_string_internal (arith_for_command->action);
+ PRINT_DEFERRED_HEREDOCS ("");
semicolon ();
indentation -= indentation_amount;
newline ("done");
@@ -653,6 +655,7 @@ print_group_command (group_command)
}
make_command_string_internal (group_command->command);
+ PRINT_DEFERRED_HEREDOCS ("");
if (inside_function_def)
{