diff options
| author | Mark Bainter <mbainter+github@gmail.com> | 2015-04-13 02:22:02 +0000 |
|---|---|---|
| committer | Mark Bainter <mbainter+github@gmail.com> | 2015-04-18 04:52:07 +0000 |
| commit | 08c08ecdf3c4837889d837dbe4a3ace0bd301ead (patch) | |
| tree | a744e4344afed476fe12959e5676c0bcc0ea63cd /src | |
| parent | 78c77e8555f1e208bfce21ec15c943adaf904b8c (diff) | |
| download | rneovim-08c08ecdf3c4837889d837dbe4a3ace0bd301ead.tar.gz rneovim-08c08ecdf3c4837889d837dbe4a3ace0bd301ead.tar.bz2 rneovim-08c08ecdf3c4837889d837dbe4a3ace0bd301ead.zip | |
Remove char_u: get_mess_lang()
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/ex_cmds2.c | 14 | ||||
| -rw-r--r-- | src/nvim/option.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 848daf023f..b9f2d1f0d2 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -2970,26 +2970,26 @@ static char *get_locale_val(int what) * Obtain the current messages language. Used to set the default for * 'helplang'. May return NULL or an empty string. */ -char_u *get_mess_lang(void) +char *get_mess_lang(void) { - char_u *p; + char *p; # ifdef HAVE_GET_LOCALE_VAL # if defined(LC_MESSAGES) - p = (char_u *)get_locale_val(LC_MESSAGES); + p = get_locale_val(LC_MESSAGES); # else /* This is necessary for Win32, where LC_MESSAGES is not defined and $LANG * may be set to the LCID number. LC_COLLATE is the best guess, LC_TIME * and LC_MONETARY may be set differently for a Japanese working in the * US. */ - p = (char_u *)get_locale_val(LC_COLLATE); + p = get_locale_val(LC_COLLATE); # endif # else - p = os_getenv((char_u *)"LC_ALL"); + p = os_getenv("LC_ALL"); if (p == NULL || *p == NUL) { - p = os_getenv((char_u *)"LC_MESSAGES"); + p = os_getenv("LC_MESSAGES"); if (p == NULL || *p == NUL) - p = os_getenv((char_u *)"LANG"); + p = os_getenv("LANG"); } # endif return p; diff --git a/src/nvim/option.c b/src/nvim/option.c index 2306bc89ab..8b12a6f2a1 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -2039,7 +2039,7 @@ void set_init_1(void) } /* Set the default for 'helplang'. */ - set_helplang_default((char *)get_mess_lang()); + set_helplang_default(get_mess_lang()); } /* |