Bash-4.2 patch 7

diff --git a/patchlevel.h b/patchlevel.h
index 2a6db0ebcb375124bd7c1a301e42db377265086e..52efbd769e9fc000eb9e0685a0ec6aacca062f6b 100644 (file)
--- 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 83b23dddf209cabe1374e34f8624fd75d983e638..b23610eeb657f0e2429acc7f7f63bf87c0c2808d 100644 (file)
--- 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;