diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-02-01 12:22:15 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-02-01 12:22:15 -0300 |
| commit | 8253e29971c54310434ee93d987a99994769d717 (patch) | |
| tree | 9330e66d35c60a6547fbf8c80aea64f693d1be6f /src | |
| parent | 9f380dda827e6a227c0badb3d55565382b8412cb (diff) | |
| download | rneovim-8253e29971c54310434ee93d987a99994769d717.tar.gz rneovim-8253e29971c54310434ee93d987a99994769d717.tar.bz2 rneovim-8253e29971c54310434ee93d987a99994769d717.zip | |
Wrap calls to 'get_mess_env' into LIBINTL #ifdefs
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/ex_cmds2.c | 8 | ||||
| -rw-r--r-- | src/getchar.c | 6 | ||||
| -rw-r--r-- | src/main.c | 2 |
4 files changed, 5 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48aa9250fe..49c0ef42cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ file( GLOB IO_SOURCES io/*.c ) add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES}) -target_link_libraries (vim m) +target_link_libraries (vim m uv rt pthread) include(CheckLibraryExists) check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP) diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 0162031b75..209fcddd67 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -3394,10 +3394,10 @@ void set_lang_var() { /* When LC_MESSAGES isn't defined use the value from $LC_MESSAGES, fall * back to LC_CTYPE if it's empty. */ -# if defined(HAVE_GET_LOCALE_VAL) && defined(LC_MESSAGES) - loc = (char_u *)get_locale_val(LC_MESSAGES); -# else +# ifdef HAVE_WORKING_LIBINTL loc = get_mess_env(); +# else + loc = (char_u *)get_locale_val(LC_MESSAGES); # endif set_vim_var_string(VV_LANG, loc, -1); @@ -3448,7 +3448,7 @@ exarg_T *eap; } if (*name == NUL) { -#ifndef LC_MESSAGES +#ifdef HAVE_WORKING_LIBINTL if (what == VIM_LC_MESSAGES) p = get_mess_env(); else diff --git a/src/getchar.c b/src/getchar.c index 134f6d175b..92e1ece639 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -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) \ || defined(FEAT_CMDWIN) || defined(MACOS) || defined(PROTO) /* diff --git a/src/main.c b/src/main.c index 0c06781be8..02da51fb59 100644 --- a/src/main.c +++ b/src/main.c @@ -320,8 +320,6 @@ main(argc, argv) msg_scroll = TRUE; no_wait_return = TRUE; - init_mappings(); /* set up initial mappings */ - init_highlight(TRUE, FALSE); /* set the default highlight groups */ TIME_MSG("init highlight"); |