summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2011-11-22 20:00:41 -0500
committerChet Ramey <chet.ramey@case.edu>2011-11-22 20:00:41 -0500
commit1cc068989c89ffa51f6cd7219c826c0bb345f0f8 (patch)
treee3a0bff0215f09f3031ea220fad863215ceec8c0
parenteafc91a3506a082956fbdc8f0fb1210d00f1e035 (diff)
downloadbash-1cc068989c89ffa51f6cd7219c826c0bb345f0f8.tar.gz
Bash-4.2 patch 7
-rw-r--r--patchlevel.h2
-rw-r--r--subst.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/patchlevel.h b/patchlevel.h
index 2a6db0eb..52efbd76 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 6
+#define PATCHLEVEL 7
#endif /* _PATCHLEVEL_H_ */
diff --git a/subst.c b/subst.c
index 83b23ddd..b23610ee 100644
--- a/subst.c
+++ b/subst.c
@@ -4609,6 +4609,7 @@ expand_word_unsplit (word, quoted)
if (ifs_firstc == 0)
#endif
word->flags |= W_NOSPLIT;
+ word->flags |= W_NOSPLIT2;
result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL);
expand_no_split_dollar_star = 0;