commit becf428bc0ac7f7c5c1cc9e3213c025655c0beea
author Bram Moolenaar <Bram@vim.org> Wed Sep 30 11:24:36 2009 +0000
committer Bram Moolenaar <Bram@vim.org> Wed Sep 30 11:24:36 2009 +0000
tree 8bf42421fe23267dcedd0ba8d70a0e976000cc4d
parent 09736232affa71893b93293cc9c4681b84b0cbf2

updated for version 7.2-265

src/ex_docmd.c

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 2bdf0c7..8c74dd8 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -2695,7 +2695,7 @@
     {
 	/* 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)

src/version.c

diff --git a/src/version.c b/src/version.c
index 3633057..3102a6f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    265,
+/**/
     264,
 /**/
     263,