From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 199D8139087 for ; Thu, 22 Dec 2016 15:47:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C912E0CEC; Thu, 22 Dec 2016 15:47:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B734E0CEC for ; Thu, 22 Dec 2016 15:47:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC35F34102B for ; Thu, 22 Dec 2016 15:47:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56E5F24E0 for ; Thu, 22 Dec 2016 15:47:11 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1482421616.368cef0a46e63dbb66979571b8b643a3b7668bb2.kensington@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch X-VCS-Directories: mail-client/mutt/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 368cef0a46e63dbb66979571b8b643a3b7668bb2 X-VCS-Branch: master Date: Thu, 22 Dec 2016 15:47:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d3fcd6c6-bb65-409c-91a0-226ff4b78d42 X-Archives-Hash: 40eacfd8c8ce16700d483ae60a7a4b4f commit: 368cef0a46e63dbb66979571b8b643a3b7668bb2 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Tue Dec 13 20:22:38 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 22 15:46:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368cef0a mail-client/mutt: remove unused patch ...1-neomutt-index_format_truncation_problem.patch | 32 ---------------------- 1 file changed, 32 deletions(-) diff --git a/mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch b/mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch deleted file mode 100644 index 3798b35..00000000 --- a/mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 099af5ae3e21bdceb3baf871e4b0a8926205e707 Mon Sep 17 00:00:00 2001 -From: Richard Russon -Date: Wed, 15 Jun 2016 16:47:22 +0100 -Subject: [PATCH] fix index_format truncation problem - -mutt_wstr_trunc() didn't take index coloring into account when measuring a -string's length. When combined with a soft-fill '%* ' in the index_format it -lead to formatting problems. - -Fixes: #51 ---- - curs_lib.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/curs_lib.c b/curs_lib.c -index ce4e56d..9a3f5e5 100644 ---- a/curs_lib.c -+++ b/curs_lib.c -@@ -1201,7 +1201,12 @@ size_t mutt_wstr_trunc (const char *src, size_t maxlen, size_t maxwid, size_t *w - cw = wcwidth (wc); - /* hack because MUTT_TREE symbols aren't turned into characters - * until rendered by print_enriched_string (#3364) */ -- if (cw < 0 && cl == 1 && src[0] && src[0] < MUTT_TREE_MAX) -+ if ((cw < 0) && (src[0] == MUTT_SPECIAL_INDEX)) -+ { -+ cl = 2; /* skip the index coloring sequence */ -+ cw = 0; -+ } -+ else if (cw < 0 && cl == 1 && src[0] && src[0] < MUTT_TREE_MAX) - cw = 1; - else if (cw < 0) - cw = 0; /* unprintable wchar */