Attachment 175304 Details for Bug 213119 – patch

[patch] patch

tmux.patch (text/plain), 2.96 KB, created by Piotr Kubaj on 2016-09-30 13:43:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2016-09-30 13:43:26 UTC

Size: 2.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 422979)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tmux
>-PORTVERSION=	2.2
>-PORTREVISION=	1
>+PORTVERSION=	2.3
> CATEGORIES=	sysutils
> MASTER_SITES=	https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 422979)
>+++ distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1468847551
>-SHA256 (tmux-2.2.tar.gz) = bc28541b64f99929fe8e3ae7a02291263f3c97730781201824c0f05d7c8e19e4
>-SIZE (tmux-2.2.tar.gz) = 466852
>+TIMESTAMP = 1475240981
>+SHA256 (tmux-2.3.tar.gz) = 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b
>+SIZE (tmux-2.3.tar.gz) = 473944
> SHA256 (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 5957606b43ec4010084e20d7028044e23cc516ea100c4138d48984de53a7941b
> SIZE (imomaliev-tmux-bash-completion-e0f7021_GH0.tar.gz) = 1661
>Index: files/extra-patch-tty-keys.c
>===================================================================
>--- files/extra-patch-tty-keys.c	(revision 422979)
>+++ files/extra-patch-tty-keys.c	(working copy)
>@@ -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;
>+-	if (bspace != _POSIX_VDISABLE && (key & KEYC_MASK_KEY) == bspace)
>+-		key = (key & KEYC_MASK_MOD) | KEYC_BSPACE;
>  
>- 	goto complete_key;
>- 
>+ 	/* Remove data from buffer. */
>+ 	evbuffer_drain(tty->event->input, size);
>Index: files/patch-utf8.c
>===================================================================
>--- files/patch-utf8.c	(revision 422979)
>+++ files/patch-utf8.c	(working copy)
>@@ -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);
>- }
>-

Actions: View | Diff

Attachments on bug 213119: 175304