bug#1697: marked as done (patch for improved colouring of thread "tree")
Your message dated Sun, 4 Jan 2004 11:28:13 +0100
with message-id <20040104102813.GH9799@xxxxxxxxxxxxxxxxxxxxxxxxxx>
and subject line bug#1697: patch for improved colouring of thread "tree"
has caused the attached bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Herr der Kaefer
(administrator, GUUG bugs database)
--------------------------------------
Received: (at submit) by bugs.guug.de; 10 Nov 2003 22:17:08 +0000
>From md@xxxxxxxx Mon Nov 10 23:17:07 2003
Received: from attila.bofh.it ([213.92.8.2] ident=postfix)
by trithemius.gnupg.org with esmtp (Exim 3.35 #1 (Debian))
id 1AJKLL-0002E9-00
for <submit@xxxxxxxxxxxx>; Mon, 10 Nov 2003 23:17:07 +0100
Received: by attila.bofh.it (Postfix, from userid 10)
id 9CFB55F73F; Mon, 10 Nov 2003 23:19:38 +0100 (CET)
Received: by wonderland.linux.it (Postfix, from userid 1001)
id BF6691E5A7; Tue, 11 Nov 2003 00:10:31 +0100 (CET)
From: Marco d'Itri <md@xxxxxxxx>
To: submit@xxxxxxxxxxxx
Subject: patch for improved colouring of thread "tree"
X-GUUG-CC: 219594@xxxxxxxxxxxxxxx
Message-Id: <20031110231031.BF6691E5A7@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 11 Nov 2003 00:10:31 +0100 (CET)
X-Spam-Status: No, hits=-105.4 required=5.0
tests=AWL,BAYES_10,PATCH_UNIFIED_DIFF,USER_IN_WHITELIST
version=2.55
X-Spam-Level:
X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
Package: mutt
Version: 1.5.4+20031024-1
Severity: minor
[NOTE: this bug report has been submitted to the debian BTS as Bug#219594.
Please Cc all your replies to 219594@xxxxxxxxxxxxxxx .]
From: Cameron Patrick <cameron@xxxxxxxxxxxxxxxxxxxx>
Subject: patch for improved colouring of thread "tree"
Date: Fri, 7 Nov 2003 23:07:34 +0800
When an index line has its background colour set to something other than
the default, the thread tree is still drawn with its usual background colour.
This looks pretty awful.
The patch attached makes mutt only colourise the tree if its background
colour would be the same as for the rest of index line.
diff -ur mutt.old/menu.c mutt/menu.c
--- mutt.old/menu.c 2003-10-24 20:52:28.000000000 +0800
+++ mutt/menu.c 2003-11-07 22:32:34.000000000 +0800
@@ -38,6 +38,7 @@
size_t k;
size_t n = mutt_strlen ((char *)s);
mbstate_t mbstate;
+ short f1, f2, b1, b2;
memset (&mbstate, 0, sizeof (mbstate));
while (*s)
@@ -45,7 +46,13 @@
if (*s < M_TREE_MAX)
{
if (do_color)
- SETCOLOR (MT_COLOR_TREE);
+ {
+ pair_content(PAIR_NUMBER(ColorDefs[MT_COLOR_TREE]), &f1, &b1);
+ pair_content(PAIR_NUMBER(attr), &f2, &b2);
+ if (b1 == b2)
+ SETCOLOR (MT_COLOR_TREE);
+ }
while (*s && *s < M_TREE_MAX)
{
switch (*s)
---------------------------------------
Received: (at 1697-done) by bugs.guug.de; 4 Jan 2004 10:25:48 +0000
>From roessler+bounce@xxxxxxxxxxxxxxxxxx Sun Jan 04 11:25:45 2004
Received: from does-not-exist.info ([217.160.221.198]
helo=kamino.does-not-exist.org)
by trithemius.gnupg.org with esmtp (Exim 3.35 #1 (Debian))
id 1Ad5S5-0004mW-00
for <1697-done@xxxxxxxxxxxx>; Sun, 04 Jan 2004 11:25:45 +0100
Received: from voyager.does-not-exist.org (p3E9B9DFA.dip0.t-ipconnect.de
[62.155.157.250])
(using TLSv1 with cipher EDH-RSA-DES-CBC3-SHA (168/168 bits))
(No client certificate requested)
by kamino.does-not-exist.org (Postfix) with ESMTP
id 93F933140D5; Sun, 4 Jan 2004 11:28:25 +0100 (CET)
Received: by voyager.does-not-exist.org (Postfix, from userid 500)
id 033668076; Sun, 4 Jan 2004 11:28:13 +0100 (CET)
Date: Sun, 4 Jan 2004 11:28:13 +0100
From: Thomas Roessler <roessler@xxxxxxxxxxxxxxxxxx>
To: Cameron Patrick <cameron@xxxxxxxxxxxxxxxxxxxx>,
1697-done@xxxxxxxxxxxx
Cc: Vincent Lefevre <vincent@xxxxxxxxxx>, Marco d'Itri <md@xxxxxxxx>,
219594-quiet@xxxxxxxxxxxxxxx
Subject: Re: bug#1697: patch for improved colouring of thread "tree"
Message-ID: <20040104102813.GH9799@xxxxxxxxxxxxxxxxxxxxxxxxxx>
References: <20031110231031.BF6691E5A7@xxxxxxxxxxxxxxxxxxx>
<20031110232544.GQ27301@xxxxxxxxxxxx> <20031121083849.GA17197@xxxxxxxxxx>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20031121083849.GA17197@xxxxxxxxxx>
User-Agent: Mutt/1.5.5.1i
X-Spam-Status: No, hits=-109.0 required=4.0
tests=AWL,BAYES_01,EMAIL_ATTRIBUTION,IN_REP_TO,QUOTED_EMAIL_TEXT,
REFERENCES,REPLY_WITH_QUOTES,USER_AGENT_MUTT,
USER_IN_WHITELIST
autolearn=ham version=2.55
X-Spam-Level:
X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp)
Thanks. I've committed this patch.
On 2003-11-21 16:38:49 +0800, Cameron Patrick wrote:
> From: Cameron Patrick <cameron@xxxxxxxxxxxxxxxxxxxx>
> To: Vincent Lefevre <vincent@xxxxxxxxxx>
> Cc: Marco d'Itri <md@xxxxxxxx>, 1697@xxxxxxxxxxxx,
> 219594-quiet@xxxxxxxxxxxxxxx
> Date: Fri, 21 Nov 2003 16:38:49 +0800
> Subject: bug#1697: patch for improved colouring of thread "tree"
> Reply-To: Cameron Patrick <cameron@xxxxxxxxxxxxxxxxxxxx>, 1697@xxxxxxxxxxxx
> Organization: Parenthesis Conspiracy
> X-Spam-Level:
>
> On Tue, Nov 11, 2003 at 12:25:44AM +0100, Vincent Lefevre wrote:
> | > [NOTE: this bug report has been submitted to the debian BTS as Bug#219594.
> | > Please Cc all your replies to 219594@xxxxxxxxxxxxxxx .]
> |
> | It seems that the patch is malformed ("patch" complains).
>
> Gah, you're correct. I edited it by hand to remove a debugging
> statement and didn't realise that it would break the patch :-/
>
> Attached is one that really works ;-) - I actually built my own mutt
> package from it...
>
> Cameron.
>
> diff -ur mutt.old/menu.c mutt/menu.c
> --- mutt.old/menu.c 2003-10-24 20:52:28.000000000 +0800
> +++ mutt/menu.c 2003-11-21 16:15:42.000000000 +0800
> @@ -38,6 +38,7 @@
> size_t k;
> size_t n = mutt_strlen ((char *)s);
> mbstate_t mbstate;
> + short f1, f2, b1, b2;
>
> memset (&mbstate, 0, sizeof (mbstate));
> while (*s)
> @@ -45,7 +46,12 @@
> if (*s < M_TREE_MAX)
> {
> if (do_color)
> - SETCOLOR (MT_COLOR_TREE);
> + {
> + pair_content(PAIR_NUMBER(ColorDefs[MT_COLOR_TREE]), &f1, &b1);
> + pair_content(PAIR_NUMBER(attr), &f2, &b2);
> + if (b1 == b2)
> + SETCOLOR (MT_COLOR_TREE);
> + }
> while (*s && *s < M_TREE_MAX)
> {
> switch (*s)
--
Thomas Roessler <roessler@xxxxxxxxxxxxxxxxxx>