From owner-svn-ports-all@freebsd.org Mon May 4 08:23:49 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6ECE12C8F71; Mon, 4 May 2020 08:23:49 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49FwqS5q5tz3NnV; Mon, 4 May 2020 08:23:48 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88DF9213E6; Mon, 4 May 2020 08:23:48 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0448NmOP003224; Mon, 4 May 2020 08:23:48 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0448NmpL003219; Mon, 4 May 2020 08:23:48 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202005040823.0448NmpL003219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 4 May 2020 08:23:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533903 - in head/sysutils/tmux: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/sysutils/tmux: . files X-SVN-Commit-Revision: 533903 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2020 08:23:49 -0000 Author: mat Date: Mon May 4 08:23:47 2020 New Revision: 533903 URL: https://svnweb.freebsd.org/changeset/ports/533903 Log: Add a small patch that would be part of 3.1b if it gets released. Added: head/sysutils/tmux/files/patch-6a33a12798b2afeee6fb7bba74d86d628137921e (contents, props changed) Modified: head/sysutils/tmux/Makefile (contents, props changed) Modified: head/sysutils/tmux/Makefile ============================================================================== --- head/sysutils/tmux/Makefile Mon May 4 08:23:43 2020 (r533902) +++ head/sysutils/tmux/Makefile Mon May 4 08:23:47 2020 (r533903) @@ -3,6 +3,7 @@ PORTNAME= tmux PORTVERSION= 3.1a +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Added: head/sysutils/tmux/files/patch-6a33a12798b2afeee6fb7bba74d86d628137921e ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/tmux/files/patch-6a33a12798b2afeee6fb7bba74d86d628137921e Mon May 4 08:23:47 2020 (r533903) @@ -0,0 +1,18 @@ +From 6a33a12798b2afeee6fb7bba74d86d628137921e Mon Sep 17 00:00:00 2001 +From: Nicholas Marriott +Date: Thu, 30 Apr 2020 15:20:08 +0100 +Subject: [PATCH] Do not remove the automatic-rename option from the global + set, only from the window (it must stay in the global set or tmux will + crash). GitHub issue 2188. + +--- input.c.orig 2020-04-29 20:01:18 UTC ++++ input.c +@@ -2304,7 +2304,7 @@ input_exit_rename(struct input_ctx *ictx) + return; + + if (ictx->input_len == 0) { +- oe = options_get(wp->window->options, "automatic-rename"); ++ oe = options_get_only(wp->window->options, "automatic-rename"); + if (oe != NULL) + options_remove(oe); + return;