Make ~x match In-Reply-To, too. Closes #771.

diff --git a/ChangeLog b/ChangeLog
index 46e672c7bf872e1929e491b4cdcb888f78ebba88..ef920e6eb0978ade6d3e371a31fc7ea74439bb75 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-04-07 19:57 +0200  Rocco Rutte  <pdmef@gmx.net>  (667b0006b586)
+
+       * sendlib.c: Fix b5cbd0dab863, closes #3215.
+
+       Still valgrind reports 'fromcode' as leaking.
+
+2009-04-07 11:32 +0200  Erik Hovland  <erik@hovland.org>  (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  <pdmef@gmx.net>  (d639baaf57fb)
 
        * doc/manual.xml.head: Manual: Fix typo

diff --git a/UPDATING b/UPDATING
index fe5860d4c00c1dc96468689c53ea0dedf7e7ebd6..28bd489ae68d9b8641afe0393381701d24ce02b0 100644 (file)
--- 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 173cab2ff69e34d0216b8e63f54486393edb859d..35be9640a67a4e129bc3c3920931c8002a853ac9 100644 (file)
--- a/doc/manual.xml.head
+++ b/doc/manual.xml.head
@@ -4589,7 +4589,7 @@ shows several ways to select messages.
 <row><entry>~U</entry><entry>unread messages</entry></row>
 <row><entry>~v</entry><entry>messages part of a collapsed thread.</entry></row>
 <row><entry>~V</entry><entry>cryptographically verified messages</entry></row>
-<row><entry>~x <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the <quote>References</quote> field</entry></row>
+<row><entry>~x <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the <quote>References</quote> or <quote>In-Reply-To</quote> field</entry></row>
 <row><entry>~X &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages with <emphasis>MIN</emphasis> to <emphasis>MAX</emphasis> attachments *)</entry></row>
 <row><entry>~y <emphasis>EXPR</emphasis></entry><entry>messages which contain <emphasis>EXPR</emphasis> in the <quote>X-Label</quote> field</entry></row>
 <row><entry>~z &lsqb;<emphasis>MIN</emphasis>&rsqb;-&lsqb;<emphasis>MAX</emphasis>&rsqb;</entry><entry>messages with a size in the range <emphasis>MIN</emphasis> to <emphasis>MAX</emphasis> *) **)</entry></row>

diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head
index 6451e9acff5ce7dec31afda4658e29e350eb0676..6df8c696c938659bfcf79243e80cea68ff00f7cc 100644 (file)
--- 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 24753ee1278b2fd1b0bc9c6ced6b6d1ca20d90df..5d8a85b550139a974b46f9f311429526ef819d7d 100644 (file)
--- 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,