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