summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui_gtk_x11.c6
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 40d7712316..4e89c4e70c 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5604,7 +5604,7 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
{
slen++; // ligature char by char
}
- else if (is_utf8)
+ else // is_utf8
{
if ((*(cs + slen) & 0xC0) == 0x80)
{
@@ -5638,10 +5638,6 @@ gui_gtk2_draw_string(int row, int col, char_u *s, int len, int flags)
slen++;
}
}
- else
- {
- slen++;
- }
}
else
{
diff --git a/src/version.c b/src/version.c
index 1efddd81fd..6169463cf9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3636,
+/**/
3635,
/**/
3634,