summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChet Ramey <chet.ramey@case.edu>2011-11-22 20:03:03 -0500
committerChet Ramey <chet.ramey@case.edu>2011-11-22 20:03:03 -0500
commitb4a8651a5f48c673ae4aec4b191569b46bb89d41 (patch)
tree99db54224495b0cb6a9bf42eb7833059138c1a95
parentcf391c36e29b2d7b8b7031f4bfe365de9fbebd9d (diff)
downloadbash-b4a8651a5f48c673ae4aec4b191569b46bb89d41.tar.gz
Bash-4.2 patch 16
-rw-r--r--parse.y2
-rw-r--r--patchlevel.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index bf569e1e..889e77df 100644
--- a/parse.y
+++ b/parse.y
@@ -2499,7 +2499,7 @@ yylex ()
We do this only if it is time to do so. Notice that only here
is the mail alarm reset; nothing takes place in check_mail ()
except the checking of mail. Please don't change this. */
- if (prompt_is_ps1 && time_to_check_mail ())
+ if (prompt_is_ps1 && parse_and_execute_level == 0 && time_to_check_mail ())
{
check_mail ();
reset_mail_timer ();
diff --git a/patchlevel.h b/patchlevel.h
index 05c9cc3a..dd41e764 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 15
+#define PATCHLEVEL 16
#endif /* _PATCHLEVEL_H_ */