From 0e1dd0a502c4a1b83dd5c338566fc097958f6eb5 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 26 Jan 2020 10:42:08 -0500 Subject: spell: towupper(),towlower() are not called --- src/nvim/charset.c | 1 - src/nvim/spell_defs.h | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/nvim/charset.c b/src/nvim/charset.c index e9140f8ec5..0f9e2e23c0 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -8,7 +8,6 @@ #include #include #include -#include // for towupper() and towlower() #include #include "nvim/vim.h" diff --git a/src/nvim/spell_defs.h b/src/nvim/spell_defs.h index 7bc5296239..034c580b3e 100644 --- a/src/nvim/spell_defs.h +++ b/src/nvim/spell_defs.h @@ -261,20 +261,15 @@ typedef struct trystate_S { // Use our own character-case definitions, because the current locale may // differ from what the .spl file uses. // These must not be called with negative number! -#include // for towupper() and towlower() // Multi-byte implementation. For Unicode we can call utf_*(), but don't do // that for ASCII, because we don't want to use 'casemap' here. Otherwise use // the "w" library function for characters above 255. -#define SPELL_TOFOLD(c) ((c) >= 128 ? utf_fold(c) \ - : (c) < \ - 256 ? (int)spelltab.st_fold[c] : (int)towlower(c)) +#define SPELL_TOFOLD(c) ((c) >= 128 ? utf_fold(c) : (int)spelltab.st_fold[c]) #define SPELL_TOUPPER(c) ((c) >= 128 ? mb_toupper(c) \ - : (c) < \ - 256 ? (int)spelltab.st_upper[c] : (int)towupper(c)) + : (int)spelltab.st_upper[c]) -#define SPELL_ISUPPER(c) ((c) >= 128 ? mb_isupper(c) \ - : (c) < 256 ? spelltab.st_isu[c] : iswupper(c)) +#define SPELL_ISUPPER(c) ((c) >= 128 ? mb_isupper(c) : spelltab.st_isu[c]) // First language that is loaded, start of the linked list of loaded // languages. -- cgit