upstream/383769-score-match.patch: match full name with ~F, same as mutt-ng (Closes...

diff --git a/debian/changelog b/debian/changelog
index 0a2242b4416271f52bad1c1f6fe5b1e54df962b8..ed84fa54196a6e20f349e54c34c095e8a8325b67 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ mutt (1.5.20-7) unstable; urgency=low
       (Closes: 528233)
     + upstream/228671-pipe-mime.patch: don't mess up the terminal while piping
       attachments (Closes: 228671)
       (Closes: 528233)
     + upstream/228671-pipe-mime.patch: don't mess up the terminal while piping
       attachments (Closes: 228671)

+    + upstream/383769-score-match.patch: match full name with ~F, same as
+      mutt-ng (Closes: 383769)

     + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done
     + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done

diff --git a/debian/patches/series b/debian/patches/series
index 7614b5b789472c3236d1838e7f4b472dac4995fb..933b8692d11c6ccc6c2200a7f08f1b711ce23b7f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -57,6 +57,7 @@ upstream/547980-smime_keys-chaining.patch
 upstream/528233-readonly-open.patch
 upstream/228671-pipe-mime.patch
 
 upstream/528233-readonly-open.patch
 upstream/228671-pipe-mime.patch
 

+upstream/383769-score-match.patch

 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch

diff --git a/debian/patches/upstream/383769-score-match.patch b/debian/patches/upstream/383769-score-match.patch
new file mode 100644 (file)
index 0000000..f295801
--- /dev/null
+++ b/debian/patches/upstream/383769-score-match.patch
@@ -0,0 +1,14 @@
+better matching for ~F, same as mutt-ng did, see upstream
+http://bugs.mutt.org/2179
+
+--- a/score.c
++++ b/score.c
+@@ -133,7 +133,7 @@
+   hdr->score = 0; /* in case of re-scoring */
+   for (tmp = Score; tmp; tmp = tmp->next)
+   {
+-    if (mutt_pattern_exec (tmp->pat, 0, NULL, hdr) > 0)
++    if (mutt_pattern_exec (tmp->pat, M_MATCH_FULL_ADDRESS, NULL, hdr) > 0)
+     {
+       if (tmp->exact || tmp->val == 9999 || tmp->val == -9999)
+       {