Bash-4.2 patch 16

This commit is contained in:
Chet Ramey 2011-11-22 20:03:03 -05:00
commit b4a8651a5f
2 changed files with 2 additions and 2 deletions

View file

@ -2499,7 +2499,7 @@ yylex ()
We do this only if it is time to do so. Notice that only here 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 () is the mail alarm reset; nothing takes place in check_mail ()
except the checking of mail. Please don't change this. */ 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 (); check_mail ();
reset_mail_timer (); reset_mail_timer ();

View file

@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 15 #define PATCHLEVEL 16
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */