comparison src/gui.c @ 377:0fd7ac767ecd

updated for version 7.0098
author vimboss
date Thu, 30 Jun 2005 21:56:01 +0000
parents a7d1d61e5417
children d0d15b184c56
comparison
equal deleted inserted replaced
376:d2bc505a6d91 377:0fd7ac767ecd
373 * - the second user gvimrc file ($VIM/.gvimrc for Dos) 373 * - the second user gvimrc file ($VIM/.gvimrc for Dos)
374 * - the third user gvimrc file ($VIM/.gvimrc for Amiga) 374 * - the third user gvimrc file ($VIM/.gvimrc for Amiga)
375 * The first that exists is used, the rest is ignored. 375 * The first that exists is used, the rest is ignored.
376 */ 376 */
377 if (process_env((char_u *)"GVIMINIT", FALSE) == FAIL 377 if (process_env((char_u *)"GVIMINIT", FALSE) == FAIL
378 && do_source((char_u *)USR_GVIMRC_FILE, TRUE, FALSE) == FAIL 378 && do_source((char_u *)USR_GVIMRC_FILE, TRUE, TRUE) == FAIL
379 #ifdef USR_GVIMRC_FILE2 379 #ifdef USR_GVIMRC_FILE2
380 && do_source((char_u *)USR_GVIMRC_FILE2, TRUE, FALSE) == FAIL 380 && do_source((char_u *)USR_GVIMRC_FILE2, TRUE, TRUE) == FAIL
381 #endif 381 #endif
382 ) 382 )
383 { 383 {
384 #ifdef USR_GVIMRC_FILE3 384 #ifdef USR_GVIMRC_FILE3
385 (void)do_source((char_u *)USR_GVIMRC_FILE3, TRUE, FALSE); 385 (void)do_source((char_u *)USR_GVIMRC_FILE3, TRUE, TRUE);
386 #endif 386 #endif
387 } 387 }
388 388
389 /* 389 /*
390 * Read initialization commands from ".gvimrc" in current 390 * Read initialization commands from ".gvimrc" in current
424 #ifdef USR_GVIMRC_FILE3 424 #ifdef USR_GVIMRC_FILE3
425 && fullpathcmp((char_u *)USR_GVIMRC_FILE3, 425 && fullpathcmp((char_u *)USR_GVIMRC_FILE3,
426 (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME 426 (char_u *)GVIMRC_FILE, FALSE) != FPC_SAME
427 #endif 427 #endif
428 ) 428 )
429 do_source((char_u *)GVIMRC_FILE, TRUE, FALSE); 429 do_source((char_u *)GVIMRC_FILE, TRUE, TRUE);
430 430
431 if (secure == 2) 431 if (secure == 2)
432 need_wait_return = TRUE; 432 need_wait_return = TRUE;
433 secure = 0; 433 secure = 0;
434 } 434 }