]> granicus.if.org Git - vim/commitdiff
updated for version 7.4b.021 v7.4b.021
authorBram Moolenaar <Bram@vim.org>
Fri, 9 Aug 2013 18:38:26 +0000 (20:38 +0200)
committerBram Moolenaar <Bram@vim.org>
Fri, 9 Aug 2013 18:38:26 +0000 (20:38 +0200)
Problem:    Pressing "u" after an external command results in multiple
            press-enter messages. (glts)
Solution:   Don't call hit_return_msg() when we have K_IGNORE. (Christian
            Brabandt)

src/message.c
src/version.c

index 86db5a882fce2e8370b5ea9142f069ec3f488141..5f00c01c08fcec6d01d6de3c0103e999236a6c4f 100644 (file)
@@ -1004,7 +1004,7 @@ wait_return(redraw)
                        quit_more = FALSE;
                        got_int = FALSE;
                    }
-                   else
+                   else if (c != K_IGNORE)
                    {
                        c = K_IGNORE;
                        hit_return_msg();
index 3add57dd98894f4d2e1e2e98866e8f2d8e9abd75..59476e5233bbad2914ed01934afd29549e8b746e 100644 (file)
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    21,
 /**/
     20,
 /**/