Mercurial > vim
changeset 2021:e0e0d1ae6011 v7.2.318
updated for version 7.2-318
| author | vimboss |
|---|---|
| date | Wed, 16 Dec 2009 17:28:07 +0000 |
| parents | 710da9abc3c1 |
| children | 430793c2a231 |
| files | src/main.c src/version.c |
| diffstat | 2 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main.c +++ b/src/main.c @@ -366,14 +366,21 @@ main * Check if the GUI can be started. Reset gui.starting if not. * Don't know about other systems, stay on the safe side and don't check. */ - if (gui.starting && gui_init_check() == FAIL) + if (gui.starting) { - gui.starting = FALSE; - - /* When running "evim" or "gvim -y" we need the menus, exit if we - * don't have them. */ - if (params.evim_mode) - mch_exit(1); + if (gui_init_check() == FAIL) + { + gui.starting = FALSE; + + /* When running "evim" or "gvim -y" we need the menus, exit if we + * don't have them. */ + if (params.evim_mode) + mch_exit(1); + } +# if defined(HAVE_LOCALE_H) || defined(X_LOCALE) + /* Re-initialize locale, it may have been altered by gui_init_check() */ + init_locale(); +# endif } # endif #endif @@ -3685,7 +3692,7 @@ cmdsrv_main(argc, argv, serverName_arg, } else if (STRICMP(argv[i], "--servername") == 0) { - /* Alredy processed. Take it out of the command line */ + /* Already processed. Take it out of the command line */ i++; continue; }