updated for version 7.0-185

diff --git a/src/message.c b/src/message.c
index 2eee604421591991906a58a7b513ad1401767f0d..0c40823a786576e8c5575d75710685b93eff9c95 100644 (file)
--- a/src/message.c
+++ b/src/message.c
@@ -1556,7 +1556,7 @@ msg_prt_line(s, list)
     int                c_extra = 0;
     char_u     *p_extra = NULL;            /* init to make SASC shut up */
     int                n;
-    int                attr= 0;
+    int                attr = 0;
     char_u     *trail = NULL;
 #ifdef FEAT_MBYTE
     int                l;
@@ -1581,7 +1581,7 @@ msg_prt_line(s, list)
 
     while (!got_int)
     {
-       if (n_extra)
+       if (n_extra > 0)
        {
            --n_extra;
            if (c_extra)
@@ -1595,7 +1595,7 @@ msg_prt_line(s, list)
            col += (*mb_ptr2cells)(s);
            mch_memmove(buf, s, (size_t)l);
            buf[l] = NUL;
-           msg_puts_attr(buf, attr);
+           msg_puts(buf);
            s += l;
            continue;
        }
@@ -1635,6 +1635,9 @@ msg_prt_line(s, list)
                p_extra = transchar_byte(c);
                c_extra = NUL;
                c = *p_extra++;
+               /* Use special coloring to be able to distinguish <hex> from
+                * the same in plain text. */
+               attr = hl_attr(HLF_8);
            }
            else if (c == ' ' && trail != NULL && s > trail)
            {

diff --git a/src/version.c b/src/version.c
index d4c093a8bb5203cb28bb780a6a814cb3af36e184..cb266270c41b6f1ccb3309c8cb5c7044cc1a6ae2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    185,
 /**/
     184,
 /**/