aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2018-05-18 09:08:04 +0200
committerJustin M. Keyes <justinkz@gmail.com>2018-05-18 19:04:37 +0200
commit23f052edaca126891bb1a98ea5c14f355fe452f2 (patch)
tree3375e0ac0e42e7e4e75aa593ced8306db9bb5b0f
parent26d5a981eb444acf9469853d6c4988140d20cb83 (diff)
downloadrneovim-23f052edaca126891bb1a98ea5c14f355fe452f2.tar.gz
rneovim-23f052edaca126891bb1a98ea5c14f355fe452f2.tar.bz2
rneovim-23f052edaca126891bb1a98ea5c14f355fe452f2.zip
main.c: remove useless call
Vim's vimrc_found() also handles setting 'nocompatible', that's why it does vimrc_found(NULL, NULL).
-rw-r--r--src/nvim/main.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 23cea3e592..8b0d3bb2cc 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1735,7 +1735,7 @@ static bool do_user_initialization(void)
FUNC_ATTR_WARN_UNUSED_RESULT
{
bool do_exrc = p_exrc;
- if (process_env("VIMINIT", true) == OK) {
+ if (process_env("VIMINIT") == OK) {
do_exrc = p_exrc;
return do_exrc;
}
@@ -1780,7 +1780,7 @@ static bool do_user_initialization(void)
} while (iter != NULL);
xfree(config_dirs);
}
- if (process_env("EXINIT", false) == OK) {
+ if (process_env("EXINIT") == OK) {
do_exrc = p_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.
///
/// @param env environment variable to execute
-/// @param is_viminit when true, called for VIMINIT
///
/// @return FAIL if the environment variable was not executed,
/// OK otherwise.
-static int process_env(char *env, bool is_viminit)
+static int process_env(char *env)
FUNC_ATTR_NONNULL_ALL
{
const char *initstr = os_getenv(env);
if (initstr != NULL) {
- if (is_viminit) {
- vimrc_found(NULL, NULL);
- }
char_u *save_sourcing_name = sourcing_name;
linenr_T save_sourcing_lnum = sourcing_lnum;
sourcing_name = (char_u *)env;