From 5dacdc6afad429514a2a0c6febb32f1e46349769 Mon Sep 17 00:00:00 2001 From: Rocco Rutte Date: Wed, 8 Apr 2009 15:46:06 +0200 Subject: [PATCH] Make ~x match In-Reply-To, too. Closes #771. --- ChangeLog | 13 +++++++++++++ UPDATING | 1 + doc/manual.xml.head | 2 +- doc/muttrc.man.head | 2 +- pattern.c | 3 ++- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46e672c7b..ef920e6eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2009-04-07 19:57 +0200 Rocco Rutte (667b0006b586) + + * sendlib.c: Fix b5cbd0dab863, closes #3215. + + Still valgrind reports 'fromcode' as leaking. + +2009-04-07 11:32 +0200 Erik Hovland (d344c6429a48) + + * ChangeLog, sendlib.c: Try to correct usage of tempfile and *tempfile + + Since tempfile is a double pointer checking for tempfile and then + dereferencing with *tempfile is not correct. + 2009-04-06 22:05 +0200 Rocco Rutte (d639baaf57fb) * doc/manual.xml.head: Manual: Fix typo diff --git a/UPDATING b/UPDATING index fe5860d4c..28bd489ae 100644 --- a/UPDATING +++ b/UPDATING @@ -5,6 +5,7 @@ The keys used are: !: modified feature, -: deleted feature, +: new feature hg tip: + + ~x pattern also matches against In-Reply-To + lower case patterns for string searches perform case-insensitive search as regex patterns do (except IMAP) + $ssl_verify_dates controls whether mutt checks the validity period of diff --git a/doc/manual.xml.head b/doc/manual.xml.head index 173cab2ff..35be9640a 100644 --- a/doc/manual.xml.head +++ b/doc/manual.xml.head @@ -4589,7 +4589,7 @@ shows several ways to select messages. ~Uunread messages ~vmessages part of a collapsed thread. ~Vcryptographically verified messages -~x EXPRmessages which contain EXPR in the References field +~x EXPRmessages which contain EXPR in the References or In-Reply-To field ~X [MIN]-[MAX]messages with MIN to MAX attachments *) ~y EXPRmessages which contain EXPR in the X-Label field ~z [MIN]-[MAX]messages with a size in the range MIN to MAX *) **) diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head index 6451e9acf..6df8c696c 100644 --- a/doc/muttrc.man.head +++ b/doc/muttrc.man.head @@ -558,7 +558,7 @@ message is part of a collapsed thread. cryptographically verified messages .TP ~x \fIEXPR\fP -messages which contain \fIEXPR\fP in the \(lqReferences\(rq field +messages which contain \fIEXPR\fP in the \(lqReferences\(rq or \(lqIn-Reply-To\(rq field .TP ~X \fIMIN\fP-\fIMAX\fP messages with MIN - MAX attachments diff --git a/pattern.c b/pattern.c index 24753ee12..5d8a85b55 100644 --- a/pattern.c +++ b/pattern.c @@ -1155,7 +1155,8 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags, CONTEXT *ctx, case M_SIZE: return (pat->not ^ (h->content->length >= pat->min && (pat->max == M_MAXRANGE || h->content->length <= pat->max))); case M_REFERENCE: - return (pat->not ^ match_reference (pat, h->env->references)); + return (pat->not ^ (match_reference (pat, h->env->references) || + match_reference (pat, h->env->in_reply_to))); case M_ADDRESS: return (pat->not ^ match_adrlist (pat, flags & M_MATCH_FULL_ADDRESS, 4, h->env->from, h->env->sender, -- 2.40.0