]> granicus.if.org Git - vim/commitdiff
updated for version 7.2-037 v7.2.037
authorBram Moolenaar <Bram@vim.org>
Wed, 12 Nov 2008 13:10:15 +0000 (13:10 +0000)
committerBram Moolenaar <Bram@vim.org>
Wed, 12 Nov 2008 13:10:15 +0000 (13:10 +0000)
src/os_unix.c
src/version.c

index 2191e2e8f2973ec6dd6aff83a21656b15f98530c..782265bd916e345997efd4b4280ae4d5c7562e3a 100644 (file)
@@ -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
index 3d68f7051f03447e4a017fe641bcfb3d71a6b985..52385a312d4abae20b0ba9f35defca13e38d4108 100644 (file)
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    37,
 /**/
     36,
 /**/