diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-06-16 20:27:25 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-06-16 20:27:25 -0400 |
| commit | d199d18159c624844c9c8052d1a98b91084fb803 (patch) | |
| tree | 827dd9c4f8f1f6ef73ff1f20a609d08e36640986 /src/nvim/spell.c | |
| parent | 8bbeb4b480a72d0099a18c4d8200313600045231 (diff) | |
| parent | e85598e5a91c714c10034b6b3986a666065d1078 (diff) | |
| download | rneovim-d199d18159c624844c9c8052d1a98b91084fb803.tar.gz rneovim-d199d18159c624844c9c8052d1a98b91084fb803.tar.bz2 rneovim-d199d18159c624844c9c8052d1a98b91084fb803.zip | |
Merge #787 'removal of redundant OOM error handling'
Diffstat (limited to 'src/nvim/spell.c')
| -rw-r--r-- | src/nvim/spell.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/spell.c b/src/nvim/spell.c index 8214d95c00..ca522191b9 100644 --- a/src/nvim/spell.c +++ b/src/nvim/spell.c @@ -4438,7 +4438,7 @@ static afffile_T *spell_read_aff(spellinfo_T *spin, char_u *fname) if (is_aff_rule(items, itemcnt, "SET", 2) && aff->af_enc == NULL) { // Setup for conversion from "ENC" to 'encoding'. aff->af_enc = enc_canonize(items[1]); - if (aff->af_enc != NULL && !spin->si_ascii + if (!spin->si_ascii && convert_setup(&spin->si_conv, aff->af_enc, p_enc) == FAIL) smsg((char_u *)_("Conversion in %s not supported: from %s to %s"), @@ -5978,7 +5978,7 @@ static int spell_read_wordfile(spellinfo_T *spin, char_u *fname) // Setup for conversion to 'encoding'. line += 9; enc = enc_canonize(line); - if (enc != NULL && !spin->si_ascii + if (!spin->si_ascii && convert_setup(&spin->si_conv, enc, p_enc) == FAIL) smsg((char_u *)_("Conversion in %s not supported: from %s to %s"), |