lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
187c4eb
To: vim_dev@googlegroups.com
187c4eb
Subject: Patch 7.3.316
187c4eb
Fcc: outbox
187c4eb
From: Bram Moolenaar <Bram@moolenaar.net>
187c4eb
Mime-Version: 1.0
187c4eb
Content-Type: text/plain; charset=UTF-8
187c4eb
Content-Transfer-Encoding: 8bit
187c4eb
------------
187c4eb
187c4eb
Patch 7.3.316 (after 7.3.306)
187c4eb
Problem:    Crash when 'colorcolumn' is set and closing buffer.
187c4eb
Solution:   Check for w_buffer to be NULL. (Yasuhiro Matsumoto)
187c4eb
Files:	    src/option.c
187c4eb
187c4eb
187c4eb
*** ../vim-7.3.315/src/option.c	2011-06-12 22:13:37.000000000 +0200
187c4eb
--- src/option.c	2011-09-21 13:26:31.000000000 +0200
187c4eb
***************
187c4eb
*** 7036,7041 ****
187c4eb
--- 7036,7044 ----
187c4eb
      int		i;
187c4eb
      int		j = 0;
187c4eb
  
187c4eb
+     if (wp->w_buffer == NULL)
187c4eb
+ 	return NULL;  /* buffer was closed */
187c4eb
+ 
187c4eb
      for (s = wp->w_p_cc; *s != NUL && count < 255;)
187c4eb
      {
187c4eb
  	if (*s == '-' || *s == '+')
187c4eb
*** ../vim-7.3.315/src/version.c	2011-09-14 19:04:35.000000000 +0200
187c4eb
--- src/version.c	2011-09-21 13:40:05.000000000 +0200
187c4eb
***************
187c4eb
*** 711,712 ****
187c4eb
--- 711,714 ----
187c4eb
  {   /* Add new patch number below this line */
187c4eb
+ /**/
187c4eb
+     316,
187c4eb
  /**/
187c4eb
187c4eb
-- 
187c4eb
hundred-and-one symptoms of being an internet addict:
187c4eb
25. You believe nothing looks sexier than a man in boxer shorts illuminated
187c4eb
    only by a 17" inch svga monitor.
187c4eb
187c4eb
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
187c4eb
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
187c4eb
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
187c4eb
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///