summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-09-05 16:30:40 +0000
committerBram Moolenaar <Bram@vim.org>2006-09-05 16:30:40 +0000
commit1f788e7c432f993d38c7fba763f06ab96f7d93cb (patch)
tree54fa099a000ef451b76d38ab0e0fdbe1b9ab326e
parentc218a2e9e3041522a85b92bfe86f04de206505d0 (diff)
updated for version 7.0-089v7.0.089
-rw-r--r--src/ex_cmds.c12
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 074abfdfb7..33db477f80 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -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
diff --git a/src/version.c b/src/version.c
index 681d539339..4719a6d5d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 89,
+/**/
88,
/**/
87,