summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-12-05 16:30:07 +0100
committerBram Moolenaar <Bram@vim.org>2012-12-05 16:30:07 +0100
commita54bf400174df9f4a35013da140e537fdb24153a (patch)
treef2f22ce7bad618f8afaf0f60e82ef7c375efc60d
parent9750bb199e0f171c185bd3a23591e57922765509 (diff)
updated for version 7.3.749v7.3.749
Problem: Python interface doesn't build without the multi-byte feature. Solution: Add #ifdef. (Ken Takata)
-rw-r--r--src/if_py_both.h8
-rw-r--r--src/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 2398e812c2..339250e99c 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -520,7 +520,13 @@ VimStrwidth(PyObject *self UNUSED, PyObject *args)
if (!PyArg_ParseTuple(args, "s", &expr))
return NULL;
- return PyLong_FromLong(mb_string2cells((char_u *)expr, (int)STRLEN(expr)));
+ return PyLong_FromLong(
+#ifdef FEAT_MBYTE
+ mb_string2cells((char_u *)expr, (int)STRLEN(expr))
+#else
+ STRLEN(expr)
+#endif
+ );
}
/*
diff --git a/src/version.c b/src/version.c
index ffefbb2741..c551421f0d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -726,6 +726,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 749,
+/**/
748,
/**/
747,