|
 |
eec765a |
To: vim-dev@vim.org
|
|
|
eec765a |
Subject: Patch 7.2.318
|
|
|
eec765a |
Fcc: outbox
|
|
|
eec765a |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
eec765a |
Mime-Version: 1.0
|
|
|
eec765a |
Content-Type: text/plain; charset=UTF-8
|
|
|
eec765a |
Content-Transfer-Encoding: 8bit
|
|
|
eec765a |
------------
|
|
|
eec765a |
|
|
|
eec765a |
Patch 7.2.318
|
|
|
eec765a |
Problem: Wrong locale value breaks floating point numbers for gvim.
|
|
|
eec765a |
Solution: Set the locale again after doing GUI inits. (Dominique Pelle)
|
|
|
eec765a |
Files: src/main.c
|
|
|
eec765a |
|
|
|
eec765a |
|
|
|
eec765a |
*** ../vim-7.2.317/src/main.c 2009-11-17 12:31:30.000000000 +0100
|
|
|
eec765a |
--- src/main.c 2009-12-16 18:23:46.000000000 +0100
|
|
|
eec765a |
***************
|
|
|
eec765a |
*** 366,379 ****
|
|
|
eec765a |
* Check if the GUI can be started. Reset gui.starting if not.
|
|
|
eec765a |
* Don't know about other systems, stay on the safe side and don't check.
|
|
|
eec765a |
*/
|
|
|
eec765a |
! if (gui.starting && gui_init_check() == FAIL)
|
|
|
eec765a |
{
|
|
|
eec765a |
! gui.starting = FALSE;
|
|
|
eec765a |
|
|
|
eec765a |
! /* When running "evim" or "gvim -y" we need the menus, exit if we
|
|
|
eec765a |
! * don't have them. */
|
|
|
eec765a |
! if (params.evim_mode)
|
|
|
eec765a |
! mch_exit(1);
|
|
|
eec765a |
}
|
|
|
eec765a |
# endif
|
|
|
eec765a |
#endif
|
|
|
eec765a |
--- 366,386 ----
|
|
|
eec765a |
* Check if the GUI can be started. Reset gui.starting if not.
|
|
|
eec765a |
* Don't know about other systems, stay on the safe side and don't check.
|
|
|
eec765a |
*/
|
|
|
eec765a |
! if (gui.starting)
|
|
|
eec765a |
{
|
|
|
eec765a |
! if (gui_init_check() == FAIL)
|
|
|
eec765a |
! {
|
|
|
eec765a |
! gui.starting = FALSE;
|
|
|
eec765a |
|
|
|
eec765a |
! /* When running "evim" or "gvim -y" we need the menus, exit if we
|
|
|
eec765a |
! * don't have them. */
|
|
|
eec765a |
! if (params.evim_mode)
|
|
|
eec765a |
! mch_exit(1);
|
|
|
eec765a |
! }
|
|
|
eec765a |
! # if defined(HAVE_LOCALE_H) || defined(X_LOCALE)
|
|
|
eec765a |
! /* Re-initialize locale, it may have been altered by gui_init_check() */
|
|
|
eec765a |
! init_locale();
|
|
|
eec765a |
! # endif
|
|
|
eec765a |
}
|
|
|
eec765a |
# endif
|
|
|
eec765a |
#endif
|
|
|
eec765a |
***************
|
|
|
eec765a |
*** 3685,3691 ****
|
|
|
eec765a |
}
|
|
|
eec765a |
else if (STRICMP(argv[i], "--servername") == 0)
|
|
|
eec765a |
{
|
|
|
eec765a |
! /* Alredy processed. Take it out of the command line */
|
|
|
eec765a |
i++;
|
|
|
eec765a |
continue;
|
|
|
eec765a |
}
|
|
|
eec765a |
--- 3692,3698 ----
|
|
|
eec765a |
}
|
|
|
eec765a |
else if (STRICMP(argv[i], "--servername") == 0)
|
|
|
eec765a |
{
|
|
|
eec765a |
! /* Already processed. Take it out of the command line */
|
|
|
eec765a |
i++;
|
|
|
eec765a |
continue;
|
|
|
eec765a |
}
|
|
|
eec765a |
*** ../vim-7.2.317/src/version.c 2009-12-16 18:13:04.000000000 +0100
|
|
|
eec765a |
--- src/version.c 2009-12-16 18:26:24.000000000 +0100
|
|
|
eec765a |
***************
|
|
|
eec765a |
*** 683,684 ****
|
|
|
eec765a |
--- 683,686 ----
|
|
|
eec765a |
{ /* Add new patch number below this line */
|
|
|
eec765a |
+ /**/
|
|
|
eec765a |
+ 318,
|
|
|
eec765a |
/**/
|
|
|
eec765a |
|
|
|
eec765a |
--
|
|
|
eec765a |
hundred-and-one symptoms of being an internet addict:
|
|
|
eec765a |
36. You miss more than five meals a week downloading the latest games from
|
|
|
eec765a |
Apogee.
|
|
|
eec765a |
|
|
|
eec765a |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
eec765a |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
eec765a |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
eec765a |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|