mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
updated for version 7.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)
This commit is contained in:
12
src/gui.c
12
src/gui.c
@@ -546,11 +546,15 @@ gui_init()
|
||||
#ifdef USR_GVIMRC_FILE2
|
||||
&& 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
|
||||
}
|
||||
|
||||
@@ -592,6 +596,10 @@ gui_init()
|
||||
#ifdef USR_GVIMRC_FILE3
|
||||
&& 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);
|
||||
|
Reference in New Issue
Block a user