[PATCH v2 0/8] Improve charset and cid: handling

diff --git a/b4/949c0462389288d319ef70e18e0e7850f30540 b/b4/949c0462389288d319ef70e18e0e7850f30540
new file mode 100644 (file)
index 0000000..9ac67a3
--- /dev/null
+++ b/b4/949c0462389288d319ef70e18e0e7850f30540
@@ -0,0 +1,144 @@
+Return-Path: <amdragon@mit.edu>\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 0559C431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Jan 2015 13:17:16 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.138\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.138 tagged_above=-999 required=5\r
+       tests=[DNS_FROM_AHBL_RHSBL=2.438, RCVD_IN_DNSWL_MED=-2.3]\r
+       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 pJoLkumeA7XS for <notmuch@notmuchmail.org>;\r
+       Sat, 24 Jan 2015 13:17:12 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
+       [18.9.25.12])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8D621431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 24 Jan 2015 13:17:12 -0800 (PST)\r
+X-AuditID: 1209190c-f79e46d000000eb2-03-54c40bd568b6\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       (using TLS with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id DA.8E.03762.6DB04C45; Sat, 24 Jan 2015 16:17:10 -0500 (EST)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id t0OLH9lN027942; \r
+       Sat, 24 Jan 2015 16:17:09 -0500\r
+Received: from drake (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id t0OLH6d7007448\r
+       (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
+       Sat, 24 Jan 2015 16:17:07 -0500\r
+Received: from amthrax by drake with local (Exim 4.84)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1YF84n-0005RM-IZ; Sat, 24 Jan 2015 16:17:05 -0500\r
+From: Austin Clements <amdragon@mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 0/8] Improve charset and cid: handling\r
+Date: Sat, 24 Jan 2015 16:16:55 -0500\r
+Message-Id: <1422134223-20739-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.1.3\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrAIsWRmVeSWpSXmKPExsUixCmqrXuN+0iIQd8RTosbrd2MFvvubGGy\r
+       WD2Xx+L6zZnMFm9WzmN1YPXY9fwvk8fOWXfZPQ5/Xcji8WzVLWaPLYfeMwewRnHZpKTmZJal\r
+       FunbJXBlfG/WK5gjUdG4upulgfG3cBcjJ4eEgInElfkz2CFsMYkL99azdTFycQgJLGaS+Hbn\r
+       GyOEs5FR4tfujVDORSaJH20PmCGcSYwSex7/ZATpZxPQkPh9azETiC0iIC2x8+5sVhCbWSBK\r
+       YtatRjYQW1jAUuLamv0sIDaLgKrE839XgXo5OHgFHCS2n00EMSUE5CS2rvOewMi7gJFhFaNs\r
+       Sm6Vbm5iZk5xarJucXJiXl5qka6hXm5miV5qSukmRnBASfLsYHxzUOkQowAHoxIP749/h0KE\r
+       WBPLiitzDzFKcjApifKu+nU4RIgvKT+lMiOxOCO+qDQntfgQowQHs5II74UNQDnelMTKqtSi\r
+       fJiUNAeLkjjvph98IUIC6YklqdmpqQWpRTBZGQ4OJQnexVxHQoQEi1LTUyvSMnNKENJMHJwg\r
+       w3mAhp8EqeEtLkjMLc5Mh8ifYlSUEuddD5IQAElklObB9cIi/hWjONArwryBwPgX4gEmC7ju\r
+       V0CDmYAGF2w/ADK4JBEhJdXAOHn+xTUSsU/b6jeq1b9Oma0RdHXH96u+uSXr+ic+mBrOezuC\r
+       3feY6+8rsbkvLpV1/p9mUMs4j/2Is3ZngP7XVhuN4H8Wie4pNmcTNwSwu3wWDPypsOm1xJMH\r
+       B9jDnj3fp337zifrRPV4P8HNyqJ5gu12z9q3NPceSfUQqNdonTvB9FzFbMadSizFGYmGWsxF\r
+       xYkA6svfMdMCAAA=\r
+Cc: tomi.ollila@iki.fi\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: Sat, 24 Jan 2015 21:17:16 -0000\r
+\r
+This is v2 of id:1398105468-14317-1-git-send-email-amdragon@mit.edu.\r
+This improves some comments/documentation, fixes a bug that caused\r
+cryptographic processing to not happen on HTML parts, and addresses\r
+some byte compiler warnings on Emacs 23.  This version has also been\r
+rebased against the several months of changes that happened on master\r
+since v1 (which, remarkably, was trivial).\r
+\r
+The diff from v1 is below.\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 83cbf2f..f8e5165 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -535,7 +535,10 @@ (defun notmuch-get-bodypart-binary (msg part process-crypto &optional cache)\r
+ This returns the \"raw\" content of the given part after content\r
+ transfer decoding, but with no further processing (see the\r
+ discussion of --format=raw in man notmuch-show).  In particular,\r
+-this does no charset conversion."\r
++this does no charset conversion.\r
++\r
++If CACHE is non-nil, the content of this part will be saved in\r
++MSG (if it isn't already)."\r
+   (let ((data (plist-get part :binary-content)))\r
+     (when (not data)\r
+       (let ((args `("show" "--format=raw"\r
+@@ -558,6 +561,8 @@ (defun notmuch-get-bodypart-binary (msg part process-crypto &optional cache)\r
+           (apply #'call-process notmuch-command nil '(t nil) nil args)\r
+           (setq data (buffer-string)))))\r
+       (when cache\r
++      ;; Cheat.  part is non-nil, and `plist-put' always modifies\r
++      ;; the list in place if it's non-nil.\r
+       (plist-put part :binary-content data)))\r
+     data))\r
+ \r
+@@ -567,7 +572,10 @@ (defun notmuch-get-bodypart-text (msg part process-crypto &optional cache)\r
+ This returns the content of the given part as a multibyte Lisp\r
+ string after performing content transfer decoding and any\r
+ necessary charset decoding.  It is an error to use this for\r
+-non-text/* parts."\r
++non-text/* parts.\r
++\r
++If CACHE is non-nil, the content of this part will be saved in\r
++MSG (if it isn't already)."\r
+   (let ((content (plist-get part :content)))\r
+     (when (not content)\r
+       ;; Use show --format=sexp to fetch decoded content\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index d190711..66350d4 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -781,10 +781,14 @@ (defun notmuch-show-insert-part-text/html (msg part content-type nth depth butto\r
+     (let ((mm-inline-text-html-with-w3m-keymap nil))\r
+       (notmuch-show-insert-part-*/* msg part content-type nth depth button))))\r
+ \r
++;; These functions are used by notmuch-show--insert-part-text/html-shr\r
++(declare-function libxml-parse-html-region "xml.c")\r
++(declare-function shr-insert-document "shr")\r
++\r
+ (defun notmuch-show--insert-part-text/html-shr (msg part)\r
+   ;; Make sure shr is loaded before we start let-binding its globals\r
+   (require 'shr)\r
+-  (let ((dom (let (process-crypto notmuch-show-process-crypto)\r
++  (let ((dom (let ((process-crypto notmuch-show-process-crypto))\r
+              (with-temp-buffer\r
+                (insert (notmuch-get-bodypart-text msg part process-crypto))\r
+                (libxml-parse-html-region (point-min) (point-max)))))\r
+\r
+\r