projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| e40e3b19 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.318 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.318 | |
| 11 | Problem: Wrong locale value breaks floating point numbers for gvim. | |
| 12 | Solution: Set the locale again after doing GUI inits. (Dominique Pelle) | |
| 13 | Files: src/main.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.317/src/main.c 2009-11-17 12:31:30.000000000 +0100 | |
| 17 | --- src/main.c 2009-12-16 18:23:46.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 366,379 **** | |
| 20 | * Check if the GUI can be started. Reset gui.starting if not. | |
| 21 | * Don't know about other systems, stay on the safe side and don't check. | |
| 22 | */ | |
| 23 | ! if (gui.starting && gui_init_check() == FAIL) | |
| 24 | { | |
| 25 | ! gui.starting = FALSE; | |
| 26 | ||
| 27 | ! /* When running "evim" or "gvim -y" we need the menus, exit if we | |
| 28 | ! * don't have them. */ | |
| 29 | ! if (params.evim_mode) | |
| 30 | ! mch_exit(1); | |
| 31 | } | |
| 32 | # endif | |
| 33 | #endif | |
| 34 | --- 366,386 ---- | |
| 35 | * Check if the GUI can be started. Reset gui.starting if not. | |
| 36 | * Don't know about other systems, stay on the safe side and don't check. | |
| 37 | */ | |
| 38 | ! if (gui.starting) | |
| 39 | { | |
| 40 | ! if (gui_init_check() == FAIL) | |
| 41 | ! { | |
| 42 | ! gui.starting = FALSE; | |
| 43 | ||
| 44 | ! /* When running "evim" or "gvim -y" we need the menus, exit if we | |
| 45 | ! * don't have them. */ | |
| 46 | ! if (params.evim_mode) | |
| 47 | ! mch_exit(1); | |
| 48 | ! } | |
| 49 | ! # if defined(HAVE_LOCALE_H) || defined(X_LOCALE) | |
| 50 | ! /* Re-initialize locale, it may have been altered by gui_init_check() */ | |
| 51 | ! init_locale(); | |
| 52 | ! # endif | |
| 53 | } | |
| 54 | # endif | |
| 55 | #endif | |
| 56 | *************** | |
| 57 | *** 3685,3691 **** | |
| 58 | } | |
| 59 | else if (STRICMP(argv[i], "--servername") == 0) | |
| 60 | { | |
| 61 | ! /* Alredy processed. Take it out of the command line */ | |
| 62 | i++; | |
| 63 | continue; | |
| 64 | } | |
| 65 | --- 3692,3698 ---- | |
| 66 | } | |
| 67 | else if (STRICMP(argv[i], "--servername") == 0) | |
| 68 | { | |
| 69 | ! /* Already processed. Take it out of the command line */ | |
| 70 | i++; | |
| 71 | continue; | |
| 72 | } | |
| 73 | *** ../vim-7.2.317/src/version.c 2009-12-16 18:13:04.000000000 +0100 | |
| 74 | --- src/version.c 2009-12-16 18:26:24.000000000 +0100 | |
| 75 | *************** | |
| 76 | *** 683,684 **** | |
| 77 | --- 683,686 ---- | |
| 78 | { /* Add new patch number below this line */ | |
| 79 | + /**/ | |
| 80 | + 318, | |
| 81 | /**/ | |
| 82 | ||
| 83 | -- | |
| 84 | hundred-and-one symptoms of being an internet addict: | |
| 85 | 36. You miss more than five meals a week downloading the latest games from | |
| 86 | Apogee. | |
| 87 | ||
| 88 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 89 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 90 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 91 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |