From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 12 Nov 2008 13:10:15 +0000 (+0000)
Subject: updated for version 7.2-037
X-Git-Tag: v7.2.037
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a878510770d59ba74aeafdcde824bf6d2a101647;p=thirdparty%2Fvim.git

updated for version 7.2-037
---

diff --git a/src/os_unix.c b/src/os_unix.c
index 2191e2e8f2..782265bd91 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 3d68f7051f..52385a312d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    37,
 /**/
     36,
 /**/