IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

[RFC]vim-patch:8.1.{749,1715} #10545

Browse Source 
* vim-patch:8.1.1715: emoji characters are seen as word characters for spelling

Problem:    Emoji characters are seen as word characters for spelling. (Gautam
            Iyer)
Solution:   Exclude class 3 from word characters.
06e6377009

* vim-patch:8.1.0749: error message contains garbage

Problem:    Error message contains garbage. (Dominique Pelle)
Solution:   Use correct pointer to failed expression.
6acc79f5d4
This commit is contained in:
Jan Edmund Lazo 2019-07-20 04:48:45 -04:00 committed by Justin M. Keyes
parent f55c1e4233
commit 7f66fdb54d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval.c
View File

@ -961,6 +961,7 @@ eval_to_bool(
static int eval1_emsg(char_u **arg, typval_T *rettv, bool evaluate) static int eval1_emsg(char_u **arg, typval_T *rettv, bool evaluate)
FUNC_ATTR_NONNULL_ARG(1, 2) FUNC_ATTR_NONNULL_ARG(1, 2)
{ {
const char_u *const start = *arg;
const int did_emsg_before = did_emsg; const int did_emsg_before = did_emsg;
const int called_emsg_before = called_emsg; const int called_emsg_before = called_emsg;
@ -973,7 +974,7 @@ static int eval1_emsg(char_u **arg, typval_T *rettv, bool evaluate)
if (!aborting() if (!aborting()
&& did_emsg == did_emsg_before && did_emsg == did_emsg_before
&& called_emsg == called_emsg_before) { && called_emsg == called_emsg_before) {
emsgf(_(e_invexpr2), arg); emsgf(_(e_invexpr2), start);
} }
} }
return ret; return ret;

2
src/nvim/spell.c
View File

@ -2616,7 +2616,7 @@ static bool spell_mb_isword_class(int cl, win_T *wp)
if (wp->w_s->b_cjk) if (wp->w_s->b_cjk)
// East Asian characters are not considered word characters. // East Asian characters are not considered word characters.
return cl == 2 || cl == 0x2800; return cl == 2 || cl == 0x2800;
return cl >= 2 && cl != 0x2070 && cl != 0x2080; return cl >= 2 && cl != 0x2070 && cl != 0x2080 && cl != 3;
} }
// Returns true if "p" points to a word character. // Returns true if "p" points to a word character.