diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-05-08 15:31:26 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-05-08 15:31:26 +0200 |
| commit | 89939207898fc68a2ee0c080e603aa65fb866b25 (patch) | |
| tree | 36c782cd85ab4ac34fc7da521362e95fc87bc104 /erts/emulator/drivers/win32 | |
| parent | 705e3b1137ebb2cfa1e729c9a4cf44638270f7e5 (diff) | |
| parent | b9345b4f9c44ea7dea994cb3b06d639f9bf66a8d (diff) | |
| download | otp-89939207898fc68a2ee0c080e603aa65fb866b25.tar.gz otp-89939207898fc68a2ee0c080e603aa65fb866b25.tar.bz2 otp-89939207898fc68a2ee0c080e603aa65fb866b25.zip | |
Merge branch 'nox/wide-chars/OTP-11088' into maint
* nox/wide-chars/OTP-11088:
Support wide characters in the shell through wcwidth()
Fix bogus DEBUGLOG() incantations in ttsl_drv
Diffstat (limited to 'erts/emulator/drivers/win32')
| -rw-r--r-- | erts/emulator/drivers/win32/ttsl_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/win32/ttsl_drv.c b/erts/emulator/drivers/win32/ttsl_drv.c index 1a74d21e99..8b5e3eeefd 100644 --- a/erts/emulator/drivers/win32/ttsl_drv.c +++ b/erts/emulator/drivers/win32/ttsl_drv.c @@ -414,12 +414,12 @@ static int check_buf_size(byte *s, int n) } if (utf8_mode) { /* That is, terminal is UTF8 compliant */ if (ch >= 128 || isprint(ch)) { - DEBUGLOG(("Printable(UTF-8:%d):%d",(pos - opos),ch)); + DEBUGLOG(("Printable(UTF-8:%d):%d",pos,ch)); size++; /* Buffer contains wide characters... */ } else if (ch == '\t') { size += 8; } else { - DEBUGLOG(("Magic(UTF-8:%d):%d",(pos - opos),ch)); + DEBUGLOG(("Magic(UTF-8:%d):%d",pos,ch)); size += 2; } } else { |