From b27efde70b334460a324e3a04345228d3f4992eb Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 8 Dec 2012 00:34:11 -0800 Subject: [PATCH] applying bash42-016 --- parse.y | 2 +- patchlevel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parse.y b/parse.y index bf569e1..889e77d 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 05c9cc3..dd41e76 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_ */ -- 2.7.4