diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-11-12 13:10:15 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-11-12 13:10:15 +0000 |
| commit | a878510770d59ba74aeafdcde824bf6d2a101647 (patch) | |
| tree | 9b00bb5139fd3f263862fa4eab71c12e18af3d8e | |
| parent | 12806c8844a5aa6066b6f430924fef0b47170dae (diff) | |
| download | vim-git-a878510770d59ba74aeafdcde824bf6d2a101647.tar.gz | |
updated for version 7.2-037v7.2.037
| -rw-r--r-- | src/os_unix.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 2191e2e8f..782265bd9 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -2936,7 +2936,8 @@ mch_free_mem() } # endif # endif -# ifdef FEAT_X11 + /* Don't close the display for GTK 1, it is done in exit(). */ +# if defined(FEAT_X11) && (!defined(FEAT_GUI_GTK) || defined(HAVE_GTK2)) if (x11_display != NULL # ifdef FEAT_XCLIPBOARD && x11_display != xterm_dpy diff --git a/src/version.c b/src/version.c index 3d68f7051..52385a312 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 37, +/**/ 36, /**/ 35, |