# HG changeset patch # User vimboss # Date 1226495415 0 # Node ID a8752f2805d69f51f1f6370eee8c7e2c89c57db4 # Parent 1ddec6983d9ebdb4f7a748cc171199cc8ad3d1e0 updated for version 7.2-037 diff --git a/src/os_unix.c b/src/os_unix.c --- 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 --- 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,