aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/main.c
diff options
context:
space:
mode:
authorGregory Anders <greg@gpanders.com>2022-11-05 19:30:48 -0600
committerGregory Anders <greg@gpanders.com>2022-11-17 08:23:41 -0700
commit294910a1ffd11bea0081c2b92632628ef0462eb1 (patch)
treefa2636155cf69bcced5b89f3b3ffdf8498398d89 /src/nvim/main.c
parentf1922e78a1df1b1d32779769432fb5586edf5fbb (diff)
downloadrneovim-294910a1ffd11bea0081c2b92632628ef0462eb1.tar.gz
rneovim-294910a1ffd11bea0081c2b92632628ef0462eb1.tar.bz2
rneovim-294910a1ffd11bea0081c2b92632628ef0462eb1.zip
feat(exrc): use vim.secure.read() for 'exrc' option
Diffstat (limited to 'src/nvim/main.c')
-rw-r--r--src/nvim/main.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c
index d8570f49eb..e8c1c98c38 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -2002,7 +2002,11 @@ static void source_startup_scripts(const mparm_T *const parmp)
#endif
secure = p_secure;
- if (do_source(VIMRC_FILE, true, DOSO_VIMRC) == FAIL) {
+ char *str = nlua_read_secure(VIMRC_FILE);
+ if (str != NULL) {
+ do_source_str(str, VIMRC_FILE);
+ xfree(str);
+ } else {
#if defined(UNIX)
// if ".exrc" is not owned by user set 'secure' mode
if (!os_file_owned(EXRC_FILE)) {
@@ -2011,7 +2015,11 @@ static void source_startup_scripts(const mparm_T *const parmp)
secure = 0;
}
#endif
- (void)do_source(EXRC_FILE, false, DOSO_NONE);
+ str = nlua_read_secure(EXRC_FILE);
+ if (str != NULL) {
+ do_source_str(str, EXRC_FILE);
+ xfree(str);
+ }
}
}
if (secure == 2) {