Re: [PATCH] emacs: content-type comparison should be case insensitive.

diff --git a/cf/38835b8d9eafc94332e5d7a0d975b6bd5e8c31 b/cf/38835b8d9eafc94332e5d7a0d975b6bd5e8c31
new file mode 100644 (file)
index 0000000..dc17271
--- /dev/null
+++ b/cf/38835b8d9eafc94332e5d7a0d975b6bd5e8c31
@@ -0,0 +1,116 @@
+Return-Path: <jrollins@finestructure.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 0655B431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Mar 2012 08:22:05 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.29\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.29 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3, T_MIME_NO_TEXT=0.01] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id zsFqhQqO1V2H for <notmuch@notmuchmail.org>;\r
+       Mon, 26 Mar 2012 08:22:04 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 99EBD431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 26 Mar 2012 08:22:04 -0700 (PDT)\r
+Received: from earth-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by earth-doxen-postvirus (Postfix) with ESMTP id 4F99C66E0144;\r
+       Mon, 26 Mar 2012 08:22:04 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on earth-doxen by amavisd-new\r
+Received: from finestructure.net (pool-108-27-62-184.nycmny.fios.verizon.net\r
+       [108.27.62.184]) (Authenticated sender: jrollins)\r
+       by earth-doxen-submit (Postfix) with ESMTP id E675A66E0134;\r
+       Mon, 26 Mar 2012 08:21:56 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id BFBF7573; Mon, 26 Mar 2012 08:21:55 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] emacs: content-type comparison should be case\r
+ insensitive.\r
+In-Reply-To: <1332636208-9784-1-git-send-email-markwalters1009@gmail.com>\r
+References:\r
+ <CAMoJFUuGS_y4Sqtug5Ohdic3M43_fexWOt7cAw-ebuZ_SVUnjQ@mail.gmail.com>\r
+       <1332636208-9784-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.11.1+335~gf868783 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 26 Mar 2012 08:21:55 -0700\r
+Message-ID: <87398vl758.fsf@servo.finestructure.net>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha256; protocol="application/pgp-signature"\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 26 Mar 2012 15:22:05 -0000\r
+\r
+--=-=-=\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Sun, 25 Mar 2012 00:43:28 +0000, Mark Walters <markwalters1009@gmail.com=\r
+> wrote:\r
+> The function notmuch-match-content-type was comparing content types\r
+> case sensitively. Fix it so it tests case insensitively.\r
+>=20\r
+> This fixes a bug where emacs would not include any body when replying\r
+> to a message with content-type TEXT/PLAIN.\r
+> ---\r
+>  emacs/notmuch-lib.el |    5 +++--\r
+>  1 files changed, 3 insertions(+), 2 deletions(-)\r
+>=20\r
+> diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+> index c146748..a754de7 100644\r
+> --- a/emacs/notmuch-lib.el\r
+> +++ b/emacs/notmuch-lib.el\r
+> @@ -185,8 +185,9 @@ the user hasn't set this variable with the old or new=\r
+ value."\r
+>      (st2 (notmuch-split-content-type t2)))\r
+>      (if (or (string=3D (cadr st1) "*")\r
+>          (string=3D (cadr st2) "*"))\r
+> -    (string=3D (car st1) (car st2))\r
+> -      (string=3D t1 t2))))\r
+> +    ;; Comparison of content types should be case insensitive.\r
+> +    (string=3D (downcase (car st1)) (downcase (car st2)))\r
+> +      (string=3D (downcase t1) (downcase t2)))))\r
+>=20=20\r
+>  (defvar notmuch-multipart/alternative-discouraged\r
+>    '(\r
+\r
+LGTM.\r
+\r
+jamie.\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iQIcBAEBCAAGBQJPcImTAAoJEO00zqvie6q8QCMP/R0qn1Q/YfFpoFf/tB841OlF\r
++L75SUTVlTPDJRW3t+fNIR5QhPKn88Vv97SpXPAuDmA+N8cVTKS/X05DfuwdFE0u\r
+XbsfuyaCRmQk9Wu9+GTevqlcZCZR+BsZDVc5vvi4o5zVPtBtRLbSO0KzNkbjvv7L\r
+5QbpRMR5M+pQKb+vSIQ5R9uKU5OMHymFGsRMKcEaEImMTqgx5Dj+L5PN//s4RaYT\r
+oiQ+ehVOidN3YaUkL2VH6JGIU6H1dplT3HApKgmYdyYXqtiYC4wFE/CJ8DyvPrlP\r
+AFVzm1EyxCXm0/+SymbdZTpuj4rym32qO4Nf6g68bSA+g10Aq+9Nvr8Bn0EJRkrj\r
+sbLfuiXeWig0WTFPoKBDDReR5eOV5C4OBHdffdTT17MRX03swX0NM9MsOsDegfPl\r
+i/UFVp/3a+EAqlvJVtIhn5L7szfnSfrUhUD623ZbfF1iQxMHAAu6tu8Ca9VtqVYZ\r
+WYnsrL8u3YPoJqCI6+euABboOcQ1CWRbvhK4Y/uyzFVH5XHXWCt/WLB3hNZdluoO\r
+MRl1hWnRuGTQ/AmK+3PHgl292SKupjKTAtoFysuNe0YQoLvwmnZW81A19L1Bs8Tw\r
+DsaoGAWBs9opEHg/0me/QX6mxn09LUeiROz96xImWdDC0YCqFyP/P+WuY8ZR0TrK\r
+NYTw34IxHkkER0hRF7Gu\r
+=ldx5\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r