diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-09-30 14:44:51 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-09-30 14:44:51 +0000 |
| commit | dfe57b1a1eb7acef77c0a9e9b5766781d2235b9e (patch) | |
| tree | 614dc8769060ed04e21b085932424b738d92453f /sysutils/tmux/files | |
| parent | Update to 2.1.2.0 (diff) | |
Update to 2.3.
While there, update the completion.
PR: 213119
Reported by: Piotr Kubaj
Changes: https://github.com/tmux/tmux/blob/52869ed182482c26163799a7215139f4d81b6fca/CHANGES
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=422991
Diffstat (limited to 'sysutils/tmux/files')
| -rw-r--r-- | sysutils/tmux/files/extra-patch-tty-keys.c | 12 | ||||
| -rw-r--r-- | sysutils/tmux/files/patch-utf8.c | 34 |
2 files changed, 6 insertions, 40 deletions
diff --git a/sysutils/tmux/files/extra-patch-tty-keys.c b/sysutils/tmux/files/extra-patch-tty-keys.c index ba869f1f16df..663d128b1a66 100644 --- a/sysutils/tmux/files/extra-patch-tty-keys.c +++ b/sysutils/tmux/files/extra-patch-tty-keys.c @@ -1,11 +1,11 @@ ---- tty-keys.c.orig 2016-03-02 18:08:46 UTC +--- tty-keys.c.orig 2016-04-30 12:46:35 UTC +++ tty-keys.c -@@ -572,8 +572,6 @@ first_key: +@@ -628,8 +628,6 @@ complete_key: * used. termios should have a better idea. */ bspace = tty->tio.c_cc[VERASE]; -- if (bspace != _POSIX_VDISABLE && key == bspace) -- key = KEYC_BSPACE; - - goto complete_key; +- if (bspace != _POSIX_VDISABLE && (key & KEYC_MASK_KEY) == bspace) +- key = (key & KEYC_MASK_MOD) | KEYC_BSPACE; + /* Remove data from buffer. */ + evbuffer_drain(tty->event->input, size); diff --git a/sysutils/tmux/files/patch-utf8.c b/sysutils/tmux/files/patch-utf8.c deleted file mode 100644 index 68c21ae0f9ac..000000000000 --- a/sysutils/tmux/files/patch-utf8.c +++ /dev/null @@ -1,34 +0,0 @@ -commit 65e4c57d3a554940ed5cada6dfeff403ae8d9572 -Author: Nicholas Marriott <nicholas.marriott@gmail.com> -Date: 2016-04-29 12:47:15 +0100 - - Only assume width 1 when wcwidth() returns -1 on non-OpenBSD platforms. - ---- utf8.c.orig 2016-03-02 18:29:06 UTC -+++ utf8.c -@@ -115,8 +115,24 @@ utf8_width(wchar_t wc) - int width; - - width = wcwidth(wc); -- if (width < 0 || width > 0xff) -+ if (width < 0 || width > 0xff) { -+ log_debug("Unicode %04x, wcwidth() %d", wc, width); -+ -+#ifndef __OpenBSD__ -+ /* -+ * Many platforms (particularly and inevitably OS X) have no -+ * width for relatively common characters (wcwidth() returns -+ * -1); assume width 1 in this case. This will be wrong for -+ * genuinely nonprintable characters, but they should be -+ * rare. We may pass through stuff that ideally we would block, -+ * but this is no worse than sending the same to the terminal -+ * without tmux. -+ */ -+ if (width < 0) -+ return (1); -+#endif - return (-1); -+ } - return (width); - } - |