Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/files/
Date: Thu, 22 Dec 2016 15:47:15
Message-Id: 1482421616.368cef0a46e63dbb66979571b8b643a3b7668bb2.kensington@gentoo
1 commit: 368cef0a46e63dbb66979571b8b643a3b7668bb2
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Dec 13 20:22:38 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 22 15:46:56 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368cef0a
7
8 mail-client/mutt: remove unused patch
9
10 ...1-neomutt-index_format_truncation_problem.patch | 32 ----------------------
11 1 file changed, 32 deletions(-)
12
13 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
14 deleted file mode 100644
15 index 3798b35..00000000
16 --- a/mail-client/mutt/files/mutt-1.6.1-neomutt-index_format_truncation_problem.patch
17 +++ /dev/null
18 @@ -1,32 +0,0 @@
19 -From 099af5ae3e21bdceb3baf871e4b0a8926205e707 Mon Sep 17 00:00:00 2001
20 -From: Richard Russon <rich@×××××××.org>
21 -Date: Wed, 15 Jun 2016 16:47:22 +0100
22 -Subject: [PATCH] fix index_format truncation problem
23 -
24 -mutt_wstr_trunc() didn't take index coloring into account when measuring a
25 -string's length. When combined with a soft-fill '%* ' in the index_format it
26 -lead to formatting problems.
27 -
28 -Fixes: #51
29 ----
30 - curs_lib.c | 7 ++++++-
31 - 1 file changed, 6 insertions(+), 1 deletion(-)
32 -
33 -diff --git a/curs_lib.c b/curs_lib.c
34 -index ce4e56d..9a3f5e5 100644
35 ---- a/curs_lib.c
36 -+++ b/curs_lib.c
37 -@@ -1201,7 +1201,12 @@ size_t mutt_wstr_trunc (const char *src, size_t maxlen, size_t maxwid, size_t *w
38 - cw = wcwidth (wc);
39 - /* hack because MUTT_TREE symbols aren't turned into characters
40 - * until rendered by print_enriched_string (#3364) */
41 -- if (cw < 0 && cl == 1 && src[0] && src[0] < MUTT_TREE_MAX)
42 -+ if ((cw < 0) && (src[0] == MUTT_SPECIAL_INDEX))
43 -+ {
44 -+ cl = 2; /* skip the index coloring sequence */
45 -+ cw = 0;
46 -+ }
47 -+ else if (cw < 0 && cl == 1 && src[0] && src[0] < MUTT_TREE_MAX)
48 - cw = 1;
49 - else if (cw < 0)
50 - cw = 0; /* unprintable wchar */