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