Mercurial > vim
diff src/main.c @ 24733:08eced3add83 v8.2.2905
patch 8.2.2905: no error when defaults.vim cannot be loaded
Commit: https://github.com/vim/vim/commit/1d3a14ecf0cdde026984894c592dc140a2b46887
Author: Christian Brabandt <cb@256bit.org>
Date: Sat May 29 19:53:50 2021 +0200
patch 8.2.2905: no error when defaults.vim cannot be loaded
Problem: No error when defaults.vim cannot be loaded.
Solution: Add an error message. (Christian Brabandt, closes https://github.com/vim/vim/issues/8248)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 29 May 2021 20:00:04 +0200 |
| parents | 138e9caf4a7a |
| children | 7334bf933510 |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -3128,7 +3128,11 @@ source_startup_scripts(mparm_T *parmp) if (parmp->use_vimrc != NULL) { if (STRCMP(parmp->use_vimrc, "DEFAULTS") == 0) - do_source((char_u *)VIM_DEFAULTS_FILE, FALSE, DOSO_NONE, NULL); + { + if (do_source((char_u *)VIM_DEFAULTS_FILE, FALSE, DOSO_NONE, NULL) + != OK) + emsg(e_failed_to_source_defaults); + } else if (STRCMP(parmp->use_vimrc, "NONE") == 0 || STRCMP(parmp->use_vimrc, "NORC") == 0) { @@ -3200,7 +3204,9 @@ source_startup_scripts(mparm_T *parmp) && !has_dash_c_arg) { // When no .vimrc file was found: source defaults.vim. - do_source((char_u *)VIM_DEFAULTS_FILE, FALSE, DOSO_NONE, NULL); + if (do_source((char_u *)VIM_DEFAULTS_FILE, FALSE, DOSO_NONE, + NULL) == FAIL) + emsg(e_failed_to_source_defaults); } }