Mercurial > vim

comparison src/main.c @ 2021:e0e0d1ae6011 v7.2.318

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2-318
author vimboss
date Wed, 16 Dec 2009 17:28:07 +0000
parents fff7028d50c8
children 2b273c71a14b
comparison
equal deleted inserted replaced
2020:710da9abc3c1 2021:e0e0d1ae6011
364 # if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) 364 # if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
365 /* 365 /*
366 * Check if the GUI can be started. Reset gui.starting if not. 366 * Check if the GUI can be started. Reset gui.starting if not.
367 * Don't know about other systems, stay on the safe side and don't check. 367 * Don't know about other systems, stay on the safe side and don't check.
368 */ 368 */
369 if (gui.starting && gui_init_check() == FAIL) 369 if (gui.starting)
370 { 370 {
371 gui.starting = FALSE; 371 if (gui_init_check() == FAIL)
372 372 {
373 /* When running "evim" or "gvim -y" we need the menus, exit if we 373 gui.starting = FALSE;
374 * don't have them. */ 374
375 if (params.evim_mode) 375 /* When running "evim" or "gvim -y" we need the menus, exit if we
376 mch_exit(1); 376 * don't have them. */
377 if (params.evim_mode)
378 mch_exit(1);
379 }
380 # if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
381 /* Re-initialize locale, it may have been altered by gui_init_check() */
382 init_locale();
383 # endif
377 } 384 }
378 # endif 385 # endif
379 #endif 386 #endif
380 387
381 if (GARGCOUNT > 0) 388 if (GARGCOUNT > 0)
3683 if (called_emsg) 3690 if (called_emsg)
3684 mch_errmsg("\n"); 3691 mch_errmsg("\n");
3685 } 3692 }
3686 else if (STRICMP(argv[i], "--servername") == 0) 3693 else if (STRICMP(argv[i], "--servername") == 0)
3687 { 3694 {
3688 /* Alredy processed. Take it out of the command line */ 3695 /* Already processed. Take it out of the command line */
3689 i++; 3696 i++;
3690 continue; 3697 continue;
3691 } 3698 }
3692 else 3699 else
3693 { 3700 {