lkundrak / rpms / vim

Forked from rpms/vim 4 years ago
Clone
ef3ea0d
To: vim_dev@googlegroups.com
ef3ea0d
Subject: Patch 7.4.019
ef3ea0d
Fcc: outbox
ef3ea0d
From: Bram Moolenaar <Bram@moolenaar.net>
ef3ea0d
Mime-Version: 1.0
ef3ea0d
Content-Type: text/plain; charset=UTF-8
ef3ea0d
Content-Transfer-Encoding: 8bit
ef3ea0d
------------
ef3ea0d
ef3ea0d
Patch 7.4.019
ef3ea0d
Problem:    MS-Windows: File name completion doesn't work properly with
ef3ea0d
	    Chinese characters. (Yue Wu)
ef3ea0d
Solution:   Take care of multi-byte characters when looking for the start of
ef3ea0d
	    the file name. (Ken Takata)
ef3ea0d
Files:	    src/edit.c
ef3ea0d
ef3ea0d
ef3ea0d
*** ../vim-7.4.018/src/edit.c	2013-09-05 12:49:48.000000000 +0200
ef3ea0d
--- src/edit.c	2013-09-05 13:45:27.000000000 +0200
ef3ea0d
***************
ef3ea0d
*** 5183,5190 ****
ef3ea0d
  	}
ef3ea0d
  	else if (ctrl_x_mode == CTRL_X_FILES)
ef3ea0d
  	{
ef3ea0d
! 	    while (--startcol >= 0 && vim_isfilec(line[startcol]))
ef3ea0d
! 		;
ef3ea0d
  	    compl_col += ++startcol;
ef3ea0d
  	    compl_length = (int)curs_col - startcol;
ef3ea0d
  	    compl_pattern = addstar(line + compl_col, compl_length,
ef3ea0d
--- 5183,5196 ----
ef3ea0d
  	}
ef3ea0d
  	else if (ctrl_x_mode == CTRL_X_FILES)
ef3ea0d
  	{
ef3ea0d
! 	    char_u	*p = line + startcol;
ef3ea0d
! 
ef3ea0d
! 	    /* Go back to just before the first filename character. */
ef3ea0d
! 	    mb_ptr_back(line, p);
ef3ea0d
! 	    while (vim_isfilec(PTR2CHAR(p)) && p >= line)
ef3ea0d
! 		mb_ptr_back(line, p);
ef3ea0d
! 	    startcol = p - line;
ef3ea0d
! 
ef3ea0d
  	    compl_col += ++startcol;
ef3ea0d
  	    compl_length = (int)curs_col - startcol;
ef3ea0d
  	    compl_pattern = addstar(line + compl_col, compl_length,
ef3ea0d
*** ../vim-7.4.018/src/version.c	2013-09-05 12:49:48.000000000 +0200
ef3ea0d
--- src/version.c	2013-09-05 13:41:47.000000000 +0200
ef3ea0d
***************
ef3ea0d
*** 740,741 ****
ef3ea0d
--- 740,743 ----
ef3ea0d
  {   /* Add new patch number below this line */
ef3ea0d
+ /**/
ef3ea0d
+     19,
ef3ea0d
  /**/
ef3ea0d
ef3ea0d
-- 
ef3ea0d
        Very funny, Scotty.  Now beam down my clothes.
ef3ea0d
ef3ea0d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
ef3ea0d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
ef3ea0d
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
ef3ea0d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///