aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Schmidt <john.schmidt.h@gmail.com>2014-03-18 17:26:15 +0100
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-05 10:01:22 -0300
commit26206d4cfddb0375b14c47ccf94c480a886f29a1 (patch)
treed87658310ce35db041fc79e1c6bb85dcfc249262 /src
parent5ff29e00a59e90670d3250d3e72502fac601c818 (diff)
downloadrneovim-26206d4cfddb0375b14c47ccf94c480a886f29a1.tar.gz
rneovim-26206d4cfddb0375b14c47ccf94c480a886f29a1.tar.bz2
rneovim-26206d4cfddb0375b14c47ccf94c480a886f29a1.zip
Remove mblen() check
Diffstat (limited to 'src')
-rw-r--r--src/buffer.c1
-rw-r--r--src/charset.c3
-rw-r--r--src/ex_docmd.c1
-rw-r--r--src/mbyte.c10
4 files changed, 1 insertions, 14 deletions
diff --git a/src/buffer.c b/src/buffer.c
index e933c8ec24..27f3f5cab6 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4364,7 +4364,6 @@ int find_win_for_buf(buf_T *buf, win_T **wp, tabpage_T **tp)
win_found:
return OK;
}
-#endif
/*
* Insert the sign into the signlist.
diff --git a/src/charset.c b/src/charset.c
index 31fa78d30c..65f3621ee8 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1666,8 +1666,7 @@ char_u* skiptowhite(char_u *p)
/// @param p
///
/// @return Pointer to the next whitespace character.
-char_u* skiptowhite_esc(char_u *p)
-{
+char_u* skiptowhite_esc(char_u *p) {
while (*p != ' ' && *p != '\t' && *p != NUL) {
if (((*p == '\\') || (*p == Ctrl_V)) && (*(p + 1) != NUL)) {
++p;
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 6e14c98e1e..a5cd1863a0 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -119,7 +119,6 @@ static linenr_T get_address(char_u **, int skip, int to_other_file);
static void get_flags(exarg_T *eap);
# define HAVE_EX_SCRIPT_NI
static void ex_script_ni(exarg_T *eap);
-#endif
static char_u *invalid_range(exarg_T *eap);
static void correct_range(exarg_T *eap);
static char_u *replace_makeprg(exarg_T *eap, char_u *p,
diff --git a/src/mbyte.c b/src/mbyte.c
index 32bf7db413..fff953ebfc 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -526,14 +526,6 @@ char_u * mb_init()
else if (enc_dbcs == 0)
n = 1;
else {
-# if defined(MACOS)
- /*
- * if mblen() is not available, character which MSB is turned on
- * are treated as leading byte character. (note : This assumption
- * is not always true.)
- */
- n = (i & 0x80) ? 2 : 1;
-# else
char buf[MB_MAXBYTES + 1];
if (i == NUL) /* just in case mblen() can't handle "" */
n = 1;
@@ -568,9 +560,7 @@ char_u * mb_init()
n = 1;
}
}
-# endif
}
-
mb_bytelen_tab[i] = n;
}