projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 2f43f8e6 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.037 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.037 | |
| 11 | Problem: Double free with GTK 1 and compiled with EXITFREE. | |
| 12 | Solution: Don't close display. (Dominique Pelle) | |
| 13 | Files: src/os_unix.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.036/src/os_unix.c Wed Nov 12 13:07:48 2008 | |
| 17 | --- src/os_unix.c Wed Nov 12 11:55:33 2008 | |
| 18 | *************** | |
| 19 | *** 2936,2942 **** | |
| 20 | } | |
| 21 | # endif | |
| 22 | # endif | |
| 23 | ! # ifdef FEAT_X11 | |
| 24 | if (x11_display != NULL | |
| 25 | # ifdef FEAT_XCLIPBOARD | |
| 26 | && x11_display != xterm_dpy | |
| 27 | --- 2936,2943 ---- | |
| 28 | } | |
| 29 | # endif | |
| 30 | # endif | |
| 31 | ! /* Don't close the display for GTK 1, it is done in exit(). */ | |
| 32 | ! # if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2)) | |
| 33 | if (x11_display != NULL | |
| 34 | # ifdef FEAT_XCLIPBOARD | |
| 35 | && x11_display != xterm_dpy | |
| 36 | *** ../vim-7.2.036/src/version.c Wed Nov 12 13:35:31 2008 | |
| 37 | --- src/version.c Wed Nov 12 14:08:56 2008 | |
| 38 | *************** | |
| 39 | *** 678,679 **** | |
| 40 | --- 678,681 ---- | |
| 41 | { /* Add new patch number below this line */ | |
| 42 | + /**/ | |
| 43 | + 37, | |
| 44 | /**/ | |
| 45 | ||
| 46 | -- | |
| 47 | hundred-and-one symptoms of being an internet addict: | |
| 48 | 240. You think Webster's Dictionary is a directory of WEB sites. | |
| 49 | ||
| 50 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 51 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 52 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 53 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |