aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.2-318

Browse Source
This commit is contained in:
Bram Moolenaar
2009-12-16 17:28:07 +00:00
parent f5b6386f4f
commit 5d985b9cca
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.c
View File

@@ -366,14 +366,21 @@ main
* Check if the GUI can be started. Reset gui.starting if not. * 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. * 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 /* When running "evim" or "gvim -y" we need the menus, exit if we
* don't have them. */ * don't have them. */
if (params.evim_mode) if (params.evim_mode)
mch_exit(1); 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
#endif #endif
@@ -3685,7 +3692,7 @@ cmdsrv_main(argc, argv, serverName_arg, serverStr)
} }
else if (STRICMP(argv[i], "--servername") == 0) 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++; i++;
continue; continue;
} }

2
src/version.c
View File

@@ -681,6 +681,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
318,
/**/ /**/
317, 317,
/**/ /**/