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 @@ -676,6 +676,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 37, /**/ 36, /**/