The branch, master has been updated
via 77603c4f2de1961b3da141b3e6e4ce2f983365d4 (commit)
via 7019f77c05f45ea9267f7e768d0abb0b6a928a25 (commit)
from 9880114aff0b48649f00266125da1dc3c94a70eb (commit)
- Log -----------------------------------------------------------------
commit 77603c4f2de1961b3da141b3e6e4ce2f983365d4
Merge: 7019f77 9880114
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
TODO | 2 -
cmd-set-buffer.c | 21 ++++++---
configure.ac | 4 ++
grid-view.c | 22 ----------
grid.c | 18 --------
input-keys.c | 6 +-
log.c | 116 ++++++++++--------------------------------------------
options-table.c | 14 +++---
osdep-cygwin.c | 88 +++++++++++++++++++++++++++++++++++++++++
status.c | 6 +--
tmux.1 | 10 ++--
tmux.c | 2 +-
tmux.h | 16 +-------
13 files changed, 145 insertions(+), 180 deletions(-)
commit 7019f77c05f45ea9267f7e768d0abb0b6a928a25
Author: Nicholas Marriott <nicholas.marri...@gmail.com>
Commit: Nicholas Marriott <nicholas.marri...@gmail.com>
In four byte UTF-8 sequences, only three bits of the first byte should be
used. Fix from Koga Osamu.
---
utf8.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/utf8.c b/utf8.c
index 63723d7..5babcb3 100644
--- a/utf8.c
+++ b/utf8.c
@@ -313,7 +313,7 @@ utf8_combine(const struct utf8_data *utf8data)
value = utf8data->data[3] & 0x3f;
value |= (utf8data->data[2] & 0x3f) << 6;
value |= (utf8data->data[1] & 0x3f) << 12;
- value |= (utf8data->data[0] & 0x3f) << 18;
+ value |= (utf8data->data[0] & 0x07) << 18;
break;
}
return (value);
-----------------------------------------------------------------------
Summary of changes:
utf8.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
tmux
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
tmux-cvs mailing list
tmux-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
