]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
updated for version 7.0-089 v7.0.089
authorBram Moolenaar <Bram@vim.org>
Tue, 5 Sep 2006 16:30:40 +0000 (16:30 +0000)
committerBram Moolenaar <Bram@vim.org>
Tue, 5 Sep 2006 16:30:40 +0000 (16:30 +0000)
src/ex_cmds.c
src/version.c

index 074abfdfb785077d21bc47812a4379a71531ef81..33db477f806207c3e21cff7fad15c265e095c9a5 100644 (file)
@@ -95,7 +95,10 @@ do_ascii(eap)
                _("<%s>%s%s  %d,  Hex %02x,  Octal %03o"),
                                           transchar(c), buf1, buf2, c, c, c);
 #ifdef FEAT_MBYTE
-       c = cc[ci++];
+       if (enc_utf8)
+           c = cc[ci++];
+       else
+           c = 0;
 #endif
     }
 
@@ -108,7 +111,7 @@ do_ascii(eap)
        if (len > 0)
            IObuff[len++] = ' ';
        IObuff[len++] = '<';
-       if (utf_iscomposing(c)
+       if (enc_utf8 && utf_iscomposing(c)
 # ifdef USE_GUI
                && !gui.in_use
 # endif
@@ -120,7 +123,10 @@ do_ascii(eap)
                                    : _("> %d, Hex %08x, Octal %o"), c, c, c);
        if (ci == MAX_MCO)
            break;
-       c = cc[ci++];
+       if (enc_utf8)
+           c = cc[ci++];
+       else
+           c = 0;
     }
 #endif
 
index 681d539339fa5b81e08b276c08d297bc52e61523..4719a6d5d100181ecf1c9879ec436820448e05c1 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    89,
 /**/
     88,
 /**/