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

diff --git a/f2/4ca3d78e16f1a893e877f12bb41e7f13c6736c b/f2/4ca3d78e16f1a893e877f12bb41e7f13c6736c
new file mode 100644 (file)
index 0000000..fef9a75
--- /dev/null
+++ b/f2/4ca3d78e16f1a893e877f12bb41e7f13c6736c
@@ -0,0 +1,92 @@
+Return-Path: <markwalters1009@gmail.com>\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 7160C431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Mar 2012 17:43:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] 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 fjGrvFC4EDxe for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Mar 2012 17:43:26 -0700 (PDT)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ BF386431FAE   for <notmuch@notmuchmail.org>; Sat, 24 Mar 2012 17:43:25 -0700\r
+ (PDT)\r
+Received: by wgbds10 with SMTP id ds10so2538106wgb.2\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Mar 2012 17:43:23 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=tiykjavKjundulvZT1KRcTrUVbDvYs/Tcjo98Ca0Hm8=;\r
+       b=tuM9CQlp7efsyqYOJweib1piAvueXYyn18Gdbb7FeS0+K4KN1CFySTLYmIda35rqrT\r
+       zcPVYzzDiIrkAcTMFSIUNcbNuNFavYK7iTBANiTcPW0pCDca/ASg61QedKvIJ892HiY5\r
+       9Kfl4xEtd77FE7fpuPY9h07FMZn20YWkTbXShYhNwWi43qjW1mey+dS2+Ge3yPNDCeRW\r
+       VNjgma5qQ0NPQoQiwYVYsV5T0FvcZ/dnkAJZC1chLm14X84vj7et5OCl1ZrukqM1FPKn\r
+       DNW2ZECO/kTHeTsaS6rZ4Nm/WlZgwPDIb2pMpRwVA9/A3ZhEZGx5O6iNLkq2SI5puoCe\r
+       W2oA==\r
+Received: by 10.180.107.101 with SMTP id hb5mr9237572wib.3.1332636203015;\r
+       Sat, 24 Mar 2012 17:43:23 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ ff9sm27343432wib.2.2012.03.24.17.43.21        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 24 Mar 2012 17:43:22 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: content-type comparison should be case insensitive.\r
+Date: Sun, 25 Mar 2012 00:43:28 +0000\r
+Message-Id: <1332636208-9784-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To:\r
+ <CAMoJFUuGS_y4Sqtug5Ohdic3M43_fexWOt7cAw-ebuZ_SVUnjQ@mail.gmail.com>\r
+References:\r
+ <CAMoJFUuGS_y4Sqtug5Ohdic3M43_fexWOt7cAw-ebuZ_SVUnjQ@mail.gmail.com>\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: Sun, 25 Mar 2012 00:43:26 -0000\r
+\r
+The function notmuch-match-content-type was comparing content types\r
+case sensitively. Fix it so it tests case insensitively.\r
+\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
+\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 value."\r
+       (st2 (notmuch-split-content-type t2)))\r
+     (if (or (string= (cadr st1) "*")\r
+           (string= (cadr st2) "*"))\r
+-      (string= (car st1) (car st2))\r
+-      (string= t1 t2))))\r
++      ;; Comparison of content types should be case insensitive.\r
++      (string= (downcase (car st1)) (downcase (car st2)))\r
++      (string= (downcase t1) (downcase t2)))))\r
+ \r
+ (defvar notmuch-multipart/alternative-discouraged\r
+   '(\r
+-- \r
+1.7.9.1\r
+\r