jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.025

1fa1ff
To: vim_dev@googlegroups.com
1fa1ff
Subject: Patch 7.4.025
1fa1ff
Fcc: outbox
1fa1ff
From: Bram Moolenaar <Bram@moolenaar.net>
1fa1ff
Mime-Version: 1.0
1fa1ff
Content-Type: text/plain; charset=UTF-8
1fa1ff
Content-Transfer-Encoding: 8bit
1fa1ff
------------
1fa1ff
1fa1ff
Patch 7.4.025 (after 7.4.019
1fa1ff
Problem:    Reading before start of a string.
1fa1ff
Solution:   Do not call mb_ptr_back() at start of a string. (Dominique Pelle)
1fa1ff
Files:	    src/edit.c
1fa1ff
1fa1ff
1fa1ff
*** ../vim-7.4.024/src/edit.c	2013-09-07 16:35:38.000000000 +0200
1fa1ff
--- src/edit.c	2013-09-08 15:57:20.000000000 +0200
1fa1ff
***************
1fa1ff
*** 5187,5197 ****
1fa1ff
  
1fa1ff
  	    /* Go back to just before the first filename character. */
1fa1ff
  	    mb_ptr_back(line, p);
1fa1ff
! 	    while (vim_isfilec(PTR2CHAR(p)) && p >= line)
1fa1ff
  		mb_ptr_back(line, p);
1fa1ff
! 	    startcol = (int)(p - line);
1fa1ff
  
1fa1ff
! 	    compl_col += ++startcol;
1fa1ff
  	    compl_length = (int)curs_col - startcol;
1fa1ff
  	    compl_pattern = addstar(line + compl_col, compl_length,
1fa1ff
  								EXPAND_FILES);
1fa1ff
--- 5187,5199 ----
1fa1ff
  
1fa1ff
  	    /* Go back to just before the first filename character. */
1fa1ff
  	    mb_ptr_back(line, p);
1fa1ff
! 	    while (p > line && vim_isfilec(PTR2CHAR(p)))
1fa1ff
  		mb_ptr_back(line, p);
1fa1ff
! 	    startcol = (int)(p - line) + 1;
1fa1ff
! 	    if (p == line && vim_isfilec(PTR2CHAR(p)))
1fa1ff
! 		startcol = 0;
1fa1ff
  
1fa1ff
! 	    compl_col += startcol;
1fa1ff
  	    compl_length = (int)curs_col - startcol;
1fa1ff
  	    compl_pattern = addstar(line + compl_col, compl_length,
1fa1ff
  								EXPAND_FILES);
1fa1ff
*** ../vim-7.4.024/src/version.c	2013-09-08 15:40:45.000000000 +0200
1fa1ff
--- src/version.c	2013-09-08 15:52:39.000000000 +0200
1fa1ff
***************
1fa1ff
*** 740,741 ****
1fa1ff
--- 740,743 ----
1fa1ff
  {   /* Add new patch number below this line */
1fa1ff
+ /**/
1fa1ff
+     25,
1fa1ff
  /**/
1fa1ff
1fa1ff
-- 
1fa1ff
hundred-and-one symptoms of being an internet addict:
1fa1ff
188. You purchase a laptop so you can surf while sitting on the can.
1fa1ff
1fa1ff
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
1fa1ff
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
1fa1ff
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
1fa1ff
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///