diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-06-12 20:35:58 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-06-12 20:35:58 +0200 |
commit | 22971aaa4530d6e8cb2c9c0c19b4f291d8442d61 (patch) | |
tree | 807b31b65f220fe35fc95b05fa9cbb872d99335d /src/gui.c | |
parent | 6395af8018c523da2339ecf60a457ba70494a9c4 (diff) |
updated for version 7.3.1178v7.3.1178
Problem: Can't put all Vim config files together in one directory.
Solution: Load ~/.vim/vimrc if ~/.vimrc does not exist. (Lech Lorens)
Diffstat (limited to 'src/gui.c')
-rw-r--r-- | src/gui.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -547,10 +547,14 @@ gui_init() && do_source((char_u *)USR_GVIMRC_FILE2, TRUE, DOSO_GVIMRC) == FAIL #endif +#ifdef USR_GVIMRC_FILE3 + && do_source((char_u *)USR_GVIMRC_FILE3, TRUE, + DOSO_GVIMRC) == FAIL +#endif ) { -#ifdef USR_GVIMRC_FILE3 - (void)do_source((char_u *)USR_GVIMRC_FILE3, TRUE, DOSO_GVIMRC); +#ifdef USR_GVIMRC_FILE4 + (void)do_source((char_u *)USR_GVIMRC_FILE4, TRUE, DOSO_GVIMRC); #endif } @@ -593,6 +597,10 @@ gui_init() && fullpathcmp((char_u *)USR_GVIMRC_FILE3, (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME #endif +#ifdef USR_GVIMRC_FILE4 + && fullpathcmp((char_u *)USR_GVIMRC_FILE4, + (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME +#endif ) do_source((char_u *)GVIMRC_FILE, TRUE, DOSO_GVIMRC); |