diff options
| author | Keerthan Jaic <jckeerthan@gmail.com> | 2015-08-04 21:41:38 -0400 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-23 14:54:09 +0300 |
| commit | c2dd07448ff1b2922e8ea14f909a9cbde481e5fc (patch) | |
| tree | 747efd028186695c226327a724fdc1fa72ed5dad /src/nvim/main.c | |
| parent | e38cbb93670272d0da15c60222a123b88ec55002 (diff) | |
| download | rneovim-c2dd07448ff1b2922e8ea14f909a9cbde481e5fc.tar.gz rneovim-c2dd07448ff1b2922e8ea14f909a9cbde481e5fc.tar.bz2 rneovim-c2dd07448ff1b2922e8ea14f909a9cbde481e5fc.zip | |
option,main: Partial support of XDG base directory specification
- Add functions that are able to query XDG.
- Replace defaults for
- &runtimepath. Does not follow #78.
- &viewdir.
- &undodir.
- &directory.
- &backupdir. Does not follow #78.
- vimrc location.
- Remove user vimrc file line from :version message.
Diffstat (limited to 'src/nvim/main.c')
| -rw-r--r-- | src/nvim/main.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/nvim/main.c b/src/nvim/main.c index d865260295..c1a8d3ad75 100644 --- a/src/nvim/main.c +++ b/src/nvim/main.c @@ -1840,16 +1840,9 @@ static void source_startup_scripts(mparm_T *parmp) * - second user exrc file ($VIM/.exrc for Dos) * The first that exists is used, the rest is ignored. */ + char_u *user_vimrc = (char_u *)get_from_user_conf("init.vim"); if (process_env("VIMINIT", true) != OK) { - if (do_source((char_u *)USR_VIMRC_FILE, TRUE, DOSO_VIMRC) == FAIL -#ifdef USR_VIMRC_FILE2 - && do_source((char_u *)USR_VIMRC_FILE2, TRUE, - DOSO_VIMRC) == FAIL -#endif -#ifdef USR_VIMRC_FILE3 - && do_source((char_u *)USR_VIMRC_FILE3, TRUE, - DOSO_VIMRC) == FAIL -#endif + if (do_source(user_vimrc, true, DOSO_VIMRC) == FAIL && process_env("EXINIT", FALSE) == FAIL && do_source((char_u *)USR_EXRC_FILE, FALSE, DOSO_NONE) == FAIL) { #ifdef USR_EXRC_FILE2 @@ -1875,16 +1868,8 @@ static void source_startup_scripts(mparm_T *parmp) secure = p_secure; i = FAIL; - if (path_full_compare((char_u *)USR_VIMRC_FILE, - (char_u *)VIMRC_FILE, FALSE) != kEqualFiles -#ifdef USR_VIMRC_FILE2 - && path_full_compare((char_u *)USR_VIMRC_FILE2, - (char_u *)VIMRC_FILE, FALSE) != kEqualFiles -#endif -#ifdef USR_VIMRC_FILE3 - && path_full_compare((char_u *)USR_VIMRC_FILE3, - (char_u *)VIMRC_FILE, FALSE) != kEqualFiles -#endif + if (path_full_compare(user_vimrc, + (char_u *)VIMRC_FILE, false) != kEqualFiles #ifdef SYS_VIMRC_FILE && path_full_compare((char_u *)SYS_VIMRC_FILE, (char_u *)VIMRC_FILE, FALSE) != kEqualFiles |