kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Wrap calls to 'get_mess_env' into LIBINTL #ifdefs

Browse Source
This commit is contained in:
Thiago de Arruda 2014-02-01 12:22:15 -03:00
parent 9f380dda82
commit 8253e29971
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@ -14,7 +14,7 @@ file( GLOB IO_SOURCES io/*.c )
add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES}) add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES})
target_link_libraries (vim m) target_link_libraries (vim m uv rt pthread)
include(CheckLibraryExists) include(CheckLibraryExists)
check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP) check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP)

8
src/ex_cmds2.c
View File

@ -3394,10 +3394,10 @@ void set_lang_var() {
/* When LC_MESSAGES isn't defined use the value from $LC_MESSAGES, fall /* When LC_MESSAGES isn't defined use the value from $LC_MESSAGES, fall
* back to LC_CTYPE if it's empty. */ * back to LC_CTYPE if it's empty. */
# if defined(HAVE_GET_LOCALE_VAL) && defined(LC_MESSAGES) # ifdef HAVE_WORKING_LIBINTL
loc = (char_u *)get_locale_val(LC_MESSAGES);
# else
loc = get_mess_env(); loc = get_mess_env();
# else
loc = (char_u *)get_locale_val(LC_MESSAGES);
# endif # endif
set_vim_var_string(VV_LANG, loc, -1); set_vim_var_string(VV_LANG, loc, -1);
@ -3448,7 +3448,7 @@ exarg_T *eap;
} }
if (*name == NUL) { if (*name == NUL) {
#ifndef LC_MESSAGES #ifdef HAVE_WORKING_LIBINTL
if (what == VIM_LC_MESSAGES) if (what == VIM_LC_MESSAGES)
p = get_mess_env(); p = get_mess_env();
else else

6
src/getchar.c
View File

@ -4249,12 +4249,6 @@ int *local_ptr; /* return: buffer-local mapping or NULL */
} }
/*
* Set up default mappings.
*/
void init_mappings() {
}
#if defined(MSDOS) || defined(MSWIN) || defined(OS2) \ #if defined(MSDOS) || defined(MSWIN) || defined(OS2) \
|| defined(FEAT_CMDWIN) || defined(MACOS) || defined(PROTO) || defined(FEAT_CMDWIN) || defined(MACOS) || defined(PROTO)
/* /*

2
src/main.c
View File

@ -320,8 +320,6 @@ main(argc, argv)
msg_scroll = TRUE; msg_scroll = TRUE;
no_wait_return = TRUE; no_wait_return = TRUE;
init_mappings(); /* set up initial mappings */
init_highlight(TRUE, FALSE); /* set the default highlight groups */ init_highlight(TRUE, FALSE); /* set the default highlight groups */
TIME_MSG("init highlight"); TIME_MSG("init highlight");