updated for version 7.3.138

Problem:    ":com" changes the multi-byte text of :echo. (Dimitar Dimitrov)
Solution:   Search for K_SPECIAL as a byte, not a character. (Ben Schmidt)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 733d62ee784d725901a849fc147fb57b525af54c..27048773e20c7fb2bd491b997a3aa89f8da0ec52 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -6054,15 +6054,17 @@ do_ucmd(eap)
                end = vim_strchr(start + 1, '>');
            if (buf != NULL)
            {
-               ksp = vim_strchr(p, K_SPECIAL);
-               if (ksp != NULL && (start == NULL || ksp < start || end == NULL)
+               for (ksp = p; *ksp != NUL && *ksp != K_SPECIAL; ++ksp)
+                   ;
+               if (*ksp == K_SPECIAL
+                       && (start == NULL || ksp < start || end == NULL)
                        && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER)
 # ifdef FEAT_GUI
                            || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI)
 # endif
                            ))
                {
-                   /* K_SPECIAL han been put in the buffer as K_SPECIAL
+                   /* K_SPECIAL has been put in the buffer as K_SPECIAL
                     * KS_SPECIAL KE_FILLER, like for mappings, but
                     * do_cmdline() doesn't handle that, so convert it back.
                     * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */

diff --git a/src/version.c b/src/version.c
index e7902972ba7f071ccb98d5ec770f81cbb531d4e9..4aba532b277d18a20748ef017e77dda76eede7af 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    138,
 /**/
     137,
 /**/