IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

initialization: delay logging in set_init_1()

Browse Source
This commit is contained in:
Björn Linse 2020-11-28 16:08:34 +01:00
parent ba13b94f5a
commit b8ec6a5775
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/option.c
View File

@ -342,6 +342,10 @@ static char_u SHM_ALL[] = {
/// ///
/// Called only once from main(), just after creating the first buffer. /// Called only once from main(), just after creating the first buffer.
/// If "clean_arg" is true, Nvim was started with --clean. /// If "clean_arg" is true, Nvim was started with --clean.
///
/// NOTE: ELOG() etc calls are not allowed here, as log location depends on
/// env var expansion which depends on expression evaluation and other
/// editor state initialized here. Do logging in set_init_2 or later.
void set_init_1(bool clean_arg) void set_init_1(bool clean_arg)
{ {
int opt_idx; int opt_idx;
@ -494,7 +498,6 @@ void set_init_1(bool clean_arg)
// this function. // this function.
char *rtp = runtimepath_default(clean_arg); char *rtp = runtimepath_default(clean_arg);
if (rtp) { if (rtp) {
ILOG("startup runtimepart/packpath value: %s", rtp);
set_string_default("runtimepath", rtp, true); set_string_default("runtimepath", rtp, true);
// Make a copy of 'rtp' for 'packpath' // Make a copy of 'rtp' for 'packpath'
set_string_default("packpath", rtp, false); set_string_default("packpath", rtp, false);
@ -751,6 +754,9 @@ void free_all_options(void)
/// Initialize the options, part two: After getting Rows and Columns. /// Initialize the options, part two: After getting Rows and Columns.
void set_init_2(bool headless) void set_init_2(bool headless)
{ {
// set in set_init_1 but logging is not allowed there
ILOG("startup runtimepath/packpath value: %s", p_rtp);
int idx; int idx;
// 'scroll' defaults to half the window height. The stored default is zero, // 'scroll' defaults to half the window height. The stored default is zero,