mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 00:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

main.c: remove useless call

Browse Source 
Vim's vimrc_found() also handles setting 'nocompatible', that's why it
does vimrc_found(NULL, NULL).
This commit is contained in:
Justin M. Keyes
2018-05-18 09:08:04 +02:00
parent 26d5a981eb
commit 23f052edac
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/main.c
View File

@@ -1735,7 +1735,7 @@ static bool do_user_initialization(void)
FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_WARN_UNUSED_RESULT
{ {
bool do_exrc = p_exrc; bool do_exrc = p_exrc;
if (process_env("VIMINIT", true) == OK) { if (process_env("VIMINIT") == OK) {
do_exrc = p_exrc; do_exrc = p_exrc;
return do_exrc; return do_exrc;
} }
@@ -1780,7 +1780,7 @@ static bool do_user_initialization(void)
} while (iter != NULL); } while (iter != NULL);
xfree(config_dirs); xfree(config_dirs);
} }
if (process_env("EXINIT", false) == OK) { if (process_env("EXINIT") == OK) {
do_exrc = p_exrc; do_exrc = p_exrc;
return do_exrc; return do_exrc;
} }
@@ -1844,18 +1844,14 @@ static void source_startup_scripts(const mparm_T *const parmp)
/// Get an environment variable, and execute it as Ex commands. /// Get an environment variable, and execute it as Ex commands.
/// ///
/// @param env environment variable to execute /// @param env environment variable to execute
/// @param is_viminit when true, called for VIMINIT
/// ///
/// @return FAIL if the environment variable was not executed, /// @return FAIL if the environment variable was not executed,
/// OK otherwise. /// OK otherwise.
static int process_env(char *env, bool is_viminit) static int process_env(char *env)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
const char *initstr = os_getenv(env); const char *initstr = os_getenv(env);
if (initstr != NULL) { if (initstr != NULL) {
if (is_viminit) {
vimrc_found(NULL, NULL);
}
char_u *save_sourcing_name = sourcing_name; char_u *save_sourcing_name = sourcing_name;
linenr_T save_sourcing_lnum = sourcing_lnum; linenr_T save_sourcing_lnum = sourcing_lnum;
sourcing_name = (char_u *)env; sourcing_name = (char_u *)env;