From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 6 Apr 2014 19:08:45 +0000 (+0200)
Subject: updated for version 7.4.252
X-Git-Tag: v7.4.252
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bcdb7d1669b0a37cd86446dab0c66f2e1971fa7;p=vim

updated for version 7.4.252
Problem:    Critical error in GTK, removing timer twice.
Solution:   Clear the timer after removing it. (James McCoy)
---

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 05295bf08..1cb47b44b 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -732,7 +732,10 @@ blink_cb(gpointer data UNUSED)
 gui_mch_start_blink(void)
 {
     if (blink_timer)
+    {
 	gtk_timeout_remove(blink_timer);
+	blink_timer = 0;
+    }
     /* Only switch blinking on if none of the times is zero */
     if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus)
     {
diff --git a/src/version.c b/src/version.c
index b74ea983c..f0ef62c7e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    252,
 /**/
     251,
 /**/