From: Austin Clements <amdragon@mit.edu>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH v2 1/8] emacs: Track full message and part descriptor in w3m CID store
Date: Sat, 24 Jan 2015 16:16:56 -0500 [thread overview]
Message-ID: <1422134223-20739-2-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1422134223-20739-1-git-send-email-amdragon@mit.edu>
This will simplify later changes.
---
emacs/notmuch-show.el | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 87b4881..df2389e 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -562,35 +562,26 @@ (defvar w3m-current-buffer) ;; From `w3m.el'.
(defvar notmuch-show-w3m-cid-store nil)
(make-variable-buffer-local 'notmuch-show-w3m-cid-store)
-(defun notmuch-show-w3m-cid-store-internal (content-id
- message-id
- part-number
- content-type
- content)
- (push (list content-id
- message-id
- part-number
- content-type
- content)
+(defun notmuch-show-w3m-cid-store-internal (content-id msg part content)
+ (push (list content-id msg part content)
notmuch-show-w3m-cid-store))
(defun notmuch-show-w3m-cid-store (msg part)
(let ((content-id (plist-get part :content-id)))
(when content-id
(notmuch-show-w3m-cid-store-internal (concat "cid:" content-id)
- (plist-get msg :id)
- (plist-get part :id)
- (plist-get part :content-type)
- nil))))
+ msg part nil))))
(defun notmuch-show-w3m-cid-retrieve (url &rest args)
(let ((matching-part (with-current-buffer w3m-current-buffer
(assoc url notmuch-show-w3m-cid-store))))
(if matching-part
- (let ((message-id (nth 1 matching-part))
- (part-number (nth 2 matching-part))
- (content-type (nth 3 matching-part))
- (content (nth 4 matching-part)))
+ (let* ((msg (nth 1 matching-part))
+ (part (nth 2 matching-part))
+ (content (nth 3 matching-part))
+ (message-id (plist-get msg :id))
+ (part-number (plist-get part :id))
+ (content-type (plist-get part :content-type)))
;; If we don't already have the content, get it and cache
;; it, as some messages reference the same cid: part many
;; times (hundreds!), which results in many calls to
@@ -599,11 +590,7 @@ (defun notmuch-show-w3m-cid-retrieve (url &rest args)
(setq content (notmuch-get-bodypart-internal (notmuch-id-to-query message-id)
part-number notmuch-show-process-crypto))
(with-current-buffer w3m-current-buffer
- (notmuch-show-w3m-cid-store-internal url
- message-id
- part-number
- content-type
- content)))
+ (notmuch-show-w3m-cid-store-internal url msg part content)))
(insert content)
content-type)
nil)))
--
2.1.3
next prev parent reply other threads:[~2015-01-24 21:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-24 21:16 [PATCH v2 0/8] Improve charset and cid: handling Austin Clements
2015-01-24 21:16 ` Austin Clements [this message]
2015-01-24 21:16 ` [PATCH v2 2/8] emacs: Create an API for fetching parts as undecoded binary Austin Clements
2015-01-24 21:16 ` [PATCH v2 3/8] emacs: Remove broken `notmuch-get-bodypart-content' API Austin Clements
2015-01-24 21:16 ` [PATCH v2 4/8] emacs: Return unibyte strings for binary part data Austin Clements
2015-01-24 21:17 ` [PATCH v2 5/8] emacs: Support caching in notmuch-get-bodypart-{binary, text} Austin Clements
2015-01-24 21:17 ` [PATCH v2 6/8] emacs: Use generalized content caching in w3m CID code Austin Clements
2015-01-24 21:17 ` [PATCH v2 7/8] emacs: Rewrite content ID handling Austin Clements
2015-01-24 21:17 ` [PATCH v2 8/8] emacs: Support cid: references with shr renderer Austin Clements
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1422134223-20739-2-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--cc=notmuch@notmuchmail.org \
--cc=tomi.ollila@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).