mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 13:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0252: not properly recognizing word characters between 128 and 255

Browse Source 
Problem:    Characters below 256 that are not one byte are not always
            recognized as word characters.
Solution:   Make vim_iswordc() and vim_iswordp() work the same way. Add a test
            for this. (Ozaki Kiichi)
4019cf90b8
This commit is contained in:
Jan Edmund Lazo
2018-06-23 23:40:34 -04:00
parent 70626e6a1e
commit 6ff892165a
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nvim/mbyte.c
View File

@@ -428,7 +428,7 @@ int mb_get_class_tab(const char_u *p, const uint64_t *const chartab)
}
return 1;
}
return utf_class(utf_ptr2char(p));
return utf_class_tab(utf_ptr2char(p), chartab);
}
/*
@@ -1039,7 +1039,12 @@ bool utf_printable(int c)
* 1: punctuation
* 2 or bigger: some class of word character.
*/
int utf_class(int c)
int utf_class(const int c)
{
return utf_class_tab(c, curbuf->b_chartab);
}
int utf_class_tab(const int c, const uint64_t *const chartab)
{
/* sorted list of non-overlapping intervals */
static struct clinterval {
@@ -1122,11 +1127,13 @@ int utf_class(int c)
/* First quick check for Latin1 characters, use 'iskeyword'. */
if (c < 0x100) {
if (c == ' ' || c == '\t' || c == NUL || c == 0xa0)
return 0; /* blank */
if (vim_iswordc(c))
return 2; /* word character */
return 1; /* punctuation */
if (c == ' ' || c == '\t' || c == NUL || c == 0xa0) {
return 0; // blank
}
if (vim_iswordc_tab(c, chartab)) {
return 2; // word character
}
return 1; // punctuation
}
/* binary search in table */