updated for version 7.3.695
Problem: Balloon cannot show multi-byte text.
Solution: Properly deal with multi-byte characters. (Dominique Pelle)
diff --git a/src/gui_beval.c b/src/gui_beval.c
index f9f7e00..84d6acd 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -359,7 +359,7 @@
}
}
- col = vcol2col(wp, lnum, col) - 1;
+ col = vcol2col(wp, lnum, col);
if (VIsual_active
&& wp->w_buffer == curwin->w_buffer
@@ -377,8 +377,10 @@
return FAIL;
lbuf = ml_get_buf(curwin->w_buffer, VIsual.lnum, FALSE);
- lbuf = vim_strnsave(lbuf + spos->col,
- epos->col - spos->col + (*p_sel != 'e'));
+ len = epos->col - spos->col;
+ if (*p_sel != 'e')
+ len += MB_PTR2LEN(lbuf + epos->col);
+ lbuf = vim_strnsave(lbuf + spos->col, len);
lnum = spos->lnum;
col = spos->col;
}
diff --git a/src/ui.c b/src/ui.c
index d164376..372e037 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -98,7 +98,7 @@
#endif
/*
- * ui_inchar(): low level input funcion.
+ * ui_inchar(): low level input function.
* Get characters from the keyboard.
* Return the number of characters that are available.
* If "wtime" == 0 do not wait for characters.
@@ -493,7 +493,7 @@
}
}
#else
- /* Only own the clibpard when we didn't own it yet. */
+ /* Only own the clipboard when we didn't own it yet. */
if (!cbd->owned && cbd->available)
cbd->owned = (clip_gen_own_selection(cbd) == OK);
#endif
@@ -3132,7 +3132,7 @@
char_u *start;
start = ptr = ml_get_buf(wp->w_buffer, lnum, FALSE);
- while (count <= vcol && *ptr != NUL)
+ while (count < vcol && *ptr != NUL)
{
count += win_lbr_chartabsize(wp, ptr, count, NULL);
mb_ptr_adv(ptr);
diff --git a/src/version.c b/src/version.c
index f28590b..73ca963 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 695,
+/**/
694,
/**/
693,