Mirror of the Vim source from https://github.com/vim/vim
Révision | 75f5889a5d8e8272fd17a104ef148776f9133aa8 (tree) |
---|---|
l'heure | 2008-02-20 22:59:32 |
Auteur | vimboss |
Commiter | vimboss |
updated for version 7.1-260
@@ -1290,7 +1290,8 @@ | ||
1290 | 1290 | /* If a double-cell char doesn't fit at the end of a line |
1291 | 1291 | * it wraps to the next line, it's like this char is three |
1292 | 1292 | * cells wide. */ |
1293 | - if (incr == 2 && wp->w_p_wrap && in_win_border(wp, vcol)) | |
1293 | + if (incr == 2 && wp->w_p_wrap && MB_BYTE2LEN(*ptr) > 1 | |
1294 | + && in_win_border(wp, vcol)) | |
1294 | 1295 | { |
1295 | 1296 | ++incr; |
1296 | 1297 | head = 1; |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 260, | |
671 | +/**/ | |
670 | 672 | 259, |
671 | 673 | /**/ |
672 | 674 | 258, |