diff options
| author | Bram Moolenaar <Bram@vim.org> | 2009-12-16 17:28:07 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2009-12-16 17:28:07 +0000 |
| commit | 5d985b9cca3dc629ea3ac65c7cb8d6d5fbf7e814 (patch) | |
| tree | 2e3050df0322ba13df92725f2a87c74ea02c1b1b /src | |
| parent | f5b6386f4f440aecd011118286a270a175468730 (diff) | |
updated for version 7.2-318v7.2.318
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c index 954384a56d..4e027ab8c7 100644 --- 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; + 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); + /* 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, serverStr) } 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; } diff --git a/src/version.c b/src/version.c index ff77e91b86..aeee1c0806 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 318, +/**/ 317, /**/ 316, |