aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.606

Browse Source 
Problem:    CTRL-P completion has a problem with multi-byte characters.
Solution:   Check for next character being NUL properly.  (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2012-07-19 17:18:26 +02:00
parent 1a0cee53d4
commit 94c465c53d
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/macros.h
View File

@@ -259,6 +259,8 @@
* PTR2CHAR(): get character from pointer. * PTR2CHAR(): get character from pointer.
*/ */
#ifdef FEAT_MBYTE #ifdef FEAT_MBYTE
/* Get the length of the character p points to */
# define MB_PTR2LEN(p) (has_mbyte ? (*mb_ptr2len)(p) : 1)
/* Advance multi-byte pointer, skip over composing chars. */ /* Advance multi-byte pointer, skip over composing chars. */
# define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len)(p) : 1 # define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len)(p) : 1
/* Advance multi-byte pointer, do not skip over composing chars. */ /* Advance multi-byte pointer, do not skip over composing chars. */
@@ -272,6 +274,7 @@
# define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : (int)STRLEN(p)) # define MB_CHARLEN(p) (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
# define PTR2CHAR(p) (has_mbyte ? mb_ptr2char(p) : (int)*(p)) # define PTR2CHAR(p) (has_mbyte ? mb_ptr2char(p) : (int)*(p))
#else #else
# define MB_PTR2LEN(p) 1
# define mb_ptr_adv(p) ++p # define mb_ptr_adv(p) ++p
# define mb_cptr_adv(p) ++p # define mb_cptr_adv(p) ++p
# define mb_ptr_back(s, p) --p # define mb_ptr_back(s, p) --p

2
src/search.c
View File

@@ -5141,7 +5141,7 @@ exit_matched:
&& !(compl_cont_status & CONT_SOL) && !(compl_cont_status & CONT_SOL)
#endif #endif
&& *startp != NUL && *startp != NUL
&& *(p = startp + 1) != NUL) && *(p = startp + MB_PTR2LEN(startp)) != NUL)
goto search_line; goto search_line;
} }
line_breakcheck(); line_breakcheck();

2
src/version.c
View File

@@ -714,6 +714,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
606,
/**/ /**/
605, 605,
/**/ /**/