]> granicus.if.org Git - vim/commitdiff
updated for version 7.2-265 v7.2.265
authorBram Moolenaar <Bram@vim.org>
Wed, 30 Sep 2009 11:24:36 +0000 (11:24 +0000)
committerBram Moolenaar <Bram@vim.org>
Wed, 30 Sep 2009 11:24:36 +0000 (11:24 +0000)
src/ex_docmd.c
src/version.c

index 2bdf0c7f7a09ac2c90a87e7b12c1a8d553ae5a57..8c74dd83223853dcb7555d4c09ce7fbead208fbc 100644 (file)
@@ -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)
index 3633057d3ce4d9656a31b1649913cf9b108d21c0..3102a6fec1be039c17a059cf4aea00d6dd203a73 100644 (file)
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    265,
 /**/
     264,
 /**/