summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Sławiński <amade@asmblr.net>2014-04-25 20:33:42 +0200
committerAmadeusz Sławiński <amade@asmblr.net>2014-04-25 20:33:42 +0200
commit6ba1c1cb664e970d8577b484976bfdd537da6572 (patch)
treed6a16f19675b35308e63d187f43101baffe452a2
parentff98d7ff5847e07a55b0c40c2ccc3bc430226ca0 (diff)
downloadscreen-6ba1c1cb664e970d8577b484976bfdd537da6572.tar.gz
Revert "screen outputs screen "ÿ" after a connected character."
Introduces regression This reverts commit df9bd2ca2ac62477d94fa8d0a7e6e1860437c98e.
-rw-r--r--src/ansi.c4
-rw-r--r--src/display.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/src/ansi.c b/src/ansi.c
index 135837c..e76eef4 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -726,10 +726,6 @@ register int len;
LPutChar(&curr->w_layer, &omc, ox, oy);
LGotoPos(&curr->w_layer, curr->w_x, curr->w_y);
}
- if (curr->w_mbcs)
- {
- curr->w_rend.mbcs = curr->w_mbcs = 0;
- }
break;
}
font = curr->w_rend.font;
diff --git a/src/display.c b/src/display.c
index 19c70aa..8161e1e 100644
--- a/src/display.c
+++ b/src/display.c
@@ -603,7 +603,7 @@ int c;
D_x += D_AM ? 1 : -1;
D_mbcs = 0;
}
- else if (utf8_isdouble(c) || (c >= 0xd800 && c < 0xe000))
+ else if (utf8_isdouble(c))
{
D_mbcs = c;
D_x++;