diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-04-09 13:49:57 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-04-09 13:49:57 +0000 |
| commit | 7a91a4a12ea8271ea8b5cda0b9d8dff2c0bf7e32 (patch) | |
| tree | 8275653e6ba266be03e0d8d4de43e79f6cfcf677 | |
| parent | 34cbfdf8f8e6b48c84bee38c9a804d9623ff8688 (diff) | |
updated for version 7.1-293v7.1.293
| -rw-r--r-- | src/spell.c | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/spell.c b/src/spell.c index 567c6cd363..22630b5497 100644 --- a/src/spell.c +++ b/src/spell.c @@ -753,6 +753,7 @@ static int set_spell_finish __ARGS((spelltab_T *new_st)); static int spell_iswordp __ARGS((char_u *p, buf_T *buf)); static int spell_iswordp_nmw __ARGS((char_u *p)); #ifdef FEAT_MBYTE +static int spell_mb_isword_class __ARGS((int cl)); static int spell_iswordp_w __ARGS((int *p, buf_T *buf)); #endif static int write_spell_prefcond __ARGS((FILE *fd, garray_T *gap)); @@ -9789,7 +9790,7 @@ spell_iswordp(p, buf) c = mb_ptr2char(s); if (c > 255) - return mb_get_class(s) >= 2; + return spell_mb_isword_class(mb_get_class(s)); return spelltab.st_isw[c]; } #endif @@ -9812,7 +9813,7 @@ spell_iswordp_nmw(p) { c = mb_ptr2char(p); if (c > 255) - return mb_get_class(p) >= 2; + return spell_mb_isword_class(mb_get_class(p)); return spelltab.st_isw[c]; } #endif @@ -9821,6 +9822,18 @@ spell_iswordp_nmw(p) #ifdef FEAT_MBYTE /* + * Return TRUE if word class indicates a word character. + * Only for characters above 255. + * Unicode subscript and superscript are not considered word characters. + */ + static int +spell_mb_isword_class(cl) + int cl; +{ + return cl >= 2 && cl != 0x2070 && cl != 0x2080; +} + +/* * Return TRUE if "p" points to a word character. * Wide version of spell_iswordp(). */ @@ -9841,7 +9854,7 @@ spell_iswordp_w(p, buf) if (*s > 255) { if (enc_utf8) - return utf_class(*s) >= 2; + return spell_mb_isword_class(utf_class(*s)); if (enc_dbcs) return dbcs_class((unsigned)*s >> 8, *s & 0xff) >= 2; return 0; diff --git a/src/version.c b/src/version.c index 671c4bb9f9..341d66114f 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 */ /**/ + 293, +/**/ 292, /**/ 291, |