updated for version 7.2-270

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 8c74dd83223853dcb7555d4c09ce7fbead208fbc..016a2b5e113a19f36e175c6592a79a98bf7a0045 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -8358,6 +8358,7 @@ ex_at(eap)
     exarg_T    *eap;
 {
     int                c;
+    int                prev_len = typebuf.tb_len;
 
     curwin->w_cursor.lnum = eap->line2;
 
@@ -8383,11 +8384,10 @@ ex_at(eap)
 
        /*
         * Execute from the typeahead buffer.
-        * Originally this didn't check for the typeahead buffer to be empty,
-        * thus could read more Ex commands from stdin.  It's not clear why,
-        * it is certainly unexpected.
+        * Continue until the stuff buffer is empty and all added characters
+        * have been consumed.
         */
-       while ((!stuff_empty() || typebuf.tb_len > 0) && vpeekc() == ':')
+       while (!stuff_empty() || typebuf.tb_len > prev_len)
            (void)do_cmdline(NULL, getexline, NULL, DOCMD_NOWAIT|DOCMD_VERBOSE);
 
        exec_from_reg = save_efr;

diff --git a/src/version.c b/src/version.c
index 73d2300d13ad9ed83d20ca1fcedb4b29ecc3ffe4..3b7be7cf0cd1d6b089e15336377dc6fb7e427da7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    270,
 /**/
     269,
 /**/