lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
4031a22
To: vim_dev@googlegroups.com
4031a22
Subject: Patch 7.4.252
4031a22
Fcc: outbox
4031a22
From: Bram Moolenaar <Bram@moolenaar.net>
4031a22
Mime-Version: 1.0
4031a22
Content-Type: text/plain; charset=UTF-8
4031a22
Content-Transfer-Encoding: 8bit
4031a22
------------
4031a22
4031a22
Patch 7.4.252
4031a22
Problem:    Critical error in GTK, removing timer twice.
4031a22
Solution:   Clear the timer after removing it. (James McCoy)
4031a22
Files:	    src/gui_gtk_x11.c
4031a22
4031a22
4031a22
*** ../vim-7.4.251/src/gui_gtk_x11.c	2013-06-30 17:42:13.000000000 +0200
4031a22
--- src/gui_gtk_x11.c	2014-04-06 21:04:57.595359981 +0200
4031a22
***************
4031a22
*** 732,738 ****
4031a22
--- 732,741 ----
4031a22
  gui_mch_start_blink(void)
4031a22
  {
4031a22
      if (blink_timer)
4031a22
+     {
4031a22
  	gtk_timeout_remove(blink_timer);
4031a22
+ 	blink_timer = 0;
4031a22
+     }
4031a22
      /* Only switch blinking on if none of the times is zero */
4031a22
      if (blink_waittime && blink_ontime && blink_offtime && gui.in_focus)
4031a22
      {
4031a22
*** ../vim-7.4.251/src/version.c	2014-04-06 20:45:40.127357453 +0200
4031a22
--- src/version.c	2014-04-06 21:06:25.543360173 +0200
4031a22
***************
4031a22
*** 736,737 ****
4031a22
--- 736,739 ----
4031a22
  {   /* Add new patch number below this line */
4031a22
+ /**/
4031a22
+     252,
4031a22
  /**/
4031a22
4031a22
-- 
4031a22
Everyone has a photographic memory. Some don't have film.
4031a22
4031a22
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
4031a22
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
4031a22
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
4031a22
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///