Mercurial > vim

diff src/gui.c @ 4863:c4d4f0fc12b9 v7.3.1178

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Wed, 12 Jun 2013 20:35:58 +0200
parents 66803af09906
children ba7db05e1482
line wrap: on
line diff
--- a/src/gui.c
+++ b/src/gui.c
@@ -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);