lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
789afc3
To: vim_dev@googlegroups.com
789afc3
Subject: Patch 7.4.072
789afc3
Fcc: outbox
789afc3
From: Bram Moolenaar <Bram@moolenaar.net>
789afc3
Mime-Version: 1.0
789afc3
Content-Type: text/plain; charset=UTF-8
789afc3
Content-Transfer-Encoding: 8bit
789afc3
------------
789afc3
789afc3
Patch 7.4.072
789afc3
Problem:    Crash when using Insert mode completion.
789afc3
Solution:   Avoid going past the end of pum_array. (idea by Fransisco Lopes)
789afc3
Files:      src/popupmnu.c
789afc3
789afc3
789afc3
*** ../vim-7.4.071/src/popupmnu.c	2011-08-17 18:04:28.000000000 +0200
789afc3
--- src/popupmnu.c	2013-11-02 04:01:06.000000000 +0100
789afc3
***************
789afc3
*** 282,287 ****
789afc3
--- 282,291 ----
789afc3
      int		round;
789afc3
      int		n;
789afc3
  
789afc3
+     /* Never display more than we have */
789afc3
+     if (pum_first > pum_size - pum_height)
789afc3
+ 	pum_first = pum_size - pum_height;
789afc3
+ 
789afc3
      if (pum_scrollbar)
789afc3
      {
789afc3
  	thumb_heigth = pum_height * pum_height / pum_size;
789afc3
***************
789afc3
*** 672,681 ****
789afc3
  #endif
789afc3
      }
789afc3
  
789afc3
-     /* Never display more than we have */
789afc3
-     if (pum_first > pum_size - pum_height)
789afc3
- 	pum_first = pum_size - pum_height;
789afc3
- 
789afc3
      if (!resized)
789afc3
  	pum_redraw();
789afc3
  
789afc3
--- 676,681 ----
789afc3
*** ../vim-7.4.071/src/version.c	2013-11-06 04:01:31.000000000 +0100
789afc3
--- src/version.c	2013-11-06 04:03:18.000000000 +0100
789afc3
***************
789afc3
*** 740,741 ****
789afc3
--- 740,743 ----
789afc3
  {   /* Add new patch number below this line */
789afc3
+ /**/
789afc3
+     72,
789afc3
  /**/
789afc3
789afc3
-- 
789afc3
No children may attend school with their breath smelling of "wild onions."
789afc3
		[real standing law in West Virginia, United States of America]
789afc3
789afc3
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
789afc3
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
789afc3
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
789afc3
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///