summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2009-09-30 11:24:36 +0000
committerBram Moolenaar <Bram@vim.org>2009-09-30 11:24:36 +0000
commitbecf428bc0ac7f7c5c1cc9e3213c025655c0beea (patch)
tree8bf42421fe23267dcedd0ba8d70a0e976000cc4d
parent09736232affa71893b93293cc9c4681b84b0cbf2 (diff)
updated for version 7.2-265v7.2.265
-rw-r--r--src/ex_docmd.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2bdf0c7f7a..8c74dd8322 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2695,7 +2695,7 @@ doend:
{
/* messages could be enabled for a serious error, need to check if the
* counters don't become negative */
- if (!did_emsg)
+ if (!did_emsg || msg_silent > save_msg_silent)
msg_silent = save_msg_silent;
emsg_silent -= did_esilent;
if (emsg_silent < 0)
diff --git a/src/version.c b/src/version.c
index 3633057d3c..3102a6fec1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 265,
+/**/
264,
/**/
263,