c9/b8703d5f64451f2bf8b20a99a19767099964a2

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 65810431FC3\r
   6         for <notmuch@notmuchmail.org>; Mon, 21 Apr 2014 11:38:42 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id 7yT5hr5gKCyT for <notmuch@notmuchmail.org>;\r
  16         Mon, 21 Apr 2014 11:38:37 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu\r
  18         [18.7.68.37])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 07F84431FD8\r
  22         for <notmuch@notmuchmail.org>; Mon, 21 Apr 2014 11:38:07 -0700 (PDT)\r
  23 X-AuditID: 12074425-f79906d000000cf9-2f-5355658fd36d\r
  24 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 9A.F3.03321.F8565535; Mon, 21 Apr 2014 14:38:07 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s3LIbuLh009462; \r
  31         Mon, 21 Apr 2014 14:37:57 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s3LIbs2f029714\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Mon, 21 Apr 2014 14:37:56 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1WcJ6I-0003kz-Cy; Mon, 21 Apr 2014 14:37:54 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 04/11] emacs: Track full message and part descriptor in w3m\r
  45         CID store\r
  46 Date: Mon, 21 Apr 2014 14:37:41 -0400\r
  47 Message-Id: <1398105468-14317-5-git-send-email-amdragon@mit.edu>\r
  48 X-Mailer: git-send-email 1.9.1\r
  49 In-Reply-To: <1398105468-14317-1-git-send-email-amdragon@mit.edu>\r
  50 References: <1398105468-14317-1-git-send-email-amdragon@mit.edu>\r
  51 X-Brightmail-Tracker:\r
  52  H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsUixG6notufGhpscP2zrsX1mzOZHRg9nq26\r
  53         xRzAGMVlk5Kak1mWWqRvl8CV0dbzkblgqUjF5etHmRoYj/B3MXJySAiYSGxcPp8VwhaTuHBv\r
  54         PVsXIxeHkMBsJokNkzYyQzgbGSV+vW9ggXDuMEms7PoJ5cxllHh0YTkLSD+bgIbEtv3LGUFs\r
  55         EQFpiZ13ZwPN5eBgFlCT+NOlAhIWFgiV+PHnNzOIzSKgKjHtbzMbiM0r4CDx+OZjdogz5CRO\r
  56         HpsMdhKngKNE2+qXYHEhoJoNe9cwTWDkX8DIsIpRNiW3Sjc3MTOnODVZtzg5MS8vtUjXQi83\r
  57         s0QvNaV0EyM4bFxUdzBOOKR0iFGAg1GJh7fAKDRYiDWxrLgy9xCjJAeTkijvqyigEF9Sfkpl\r
  58         RmJxRnxRaU5q8SFGCQ5mJRHe9ZpAOd6UxMqq1KJ8mJQ0B4uSOO9ba6tgIYH0xJLU7NTUgtQi\r
  59         mKwMB4eSBG9aClCjYFFqempFWmZOCUKaiYMTZDgP0PAokBre4oLE3OLMdIj8KUZFKXHeNpCE\r
  60         AEgiozQPrhcW168YxYFeEeZ1B6niAaYEuO5XQIOZgAY/2RICMrgkESEl1cCofDJd44/L76j/\r
  61         CZ6KYQ9WF5xfK5vPacu072NJRulF1Ztle6uWzp70nieErTTwt7Kiz17uN8l9czhvvujKd9z0\r
  62         rfivwtWXQWeLUmbMO628d/Gtmxal3DPSy9mzH2xbOqV1t+xvkTDp04s+BXOtlF4YePXrnfQ1\r
  63         LAJH42OvH3B9HM+4gn3G/eiXSizFGYmGWsxFxYkALQewMsYCAAA=\r
  64 X-BeenThere: notmuch@notmuchmail.org\r
  65 X-Mailman-Version: 2.1.13\r
  66 Precedence: list\r
  67 List-Id: "Use and development of the notmuch mail system."\r
  68         <notmuch.notmuchmail.org>\r
  69 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  71 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  72 List-Post: <mailto:notmuch@notmuchmail.org>\r
  73 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  74 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  75         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  76 X-List-Received-Date: Mon, 21 Apr 2014 18:38:43 -0000\r
  77 \r
  78 This will simplify later changes.\r
  79 ---\r
  80  emacs/notmuch-show.el | 33 ++++++++++-----------------------\r
  81  1 file changed, 10 insertions(+), 23 deletions(-)\r
  82 \r
  83 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
  84 index 2b225df..455cfee 100644\r
  85 --- a/emacs/notmuch-show.el\r
  86 +++ b/emacs/notmuch-show.el\r
  87 @@ -540,35 +540,26 @@ (defvar w3m-current-buffer) ;; From `w3m.el'.\r
  88  (defvar notmuch-show-w3m-cid-store nil)\r
  89  (make-variable-buffer-local 'notmuch-show-w3m-cid-store)\r
  90  \r
  91 -(defun notmuch-show-w3m-cid-store-internal (content-id\r
  92 -                                           message-id\r
  93 -                                           part-number\r
  94 -                                           content-type\r
  95 -                                           content)\r
  96 -  (push (list content-id\r
  97 -             message-id\r
  98 -             part-number\r
  99 -             content-type\r
 100 -             content)\r
 101 +(defun notmuch-show-w3m-cid-store-internal (content-id msg part content)\r
 102 +  (push (list content-id msg part content)\r
 103         notmuch-show-w3m-cid-store))\r
 104  \r
 105  (defun notmuch-show-w3m-cid-store (msg part)\r
 106    (let ((content-id (plist-get part :content-id)))\r
 107      (when content-id\r
 108        (notmuch-show-w3m-cid-store-internal (concat "cid:" content-id)\r
 109 -                                          (plist-get msg :id)\r
 110 -                                          (plist-get part :id)\r
 111 -                                          (plist-get part :content-type)\r
 112 -                                          nil))))\r
 113 +                                          msg part nil))))\r
 114  \r
 115  (defun notmuch-show-w3m-cid-retrieve (url &rest args)\r
 116    (let ((matching-part (with-current-buffer w3m-current-buffer\r
 117                          (assoc url notmuch-show-w3m-cid-store))))\r
 118      (if matching-part\r
 119 -       (let ((message-id (nth 1 matching-part))\r
 120 -             (part-number (nth 2 matching-part))\r
 121 -             (content-type (nth 3 matching-part))\r
 122 -             (content (nth 4 matching-part)))\r
 123 +       (let* ((msg (nth 1 matching-part))\r
 124 +              (part (nth 2 matching-part))\r
 125 +              (content (nth 3 matching-part))\r
 126 +              (message-id (plist-get msg :id))\r
 127 +              (part-number (plist-get part :id))\r
 128 +              (content-type (plist-get part :content-type)))\r
 129           ;; If we don't already have the content, get it and cache\r
 130           ;; it, as some messages reference the same cid: part many\r
 131           ;; times (hundreds!), which results in many calls to\r
 132 @@ -577,11 +568,7 @@ (defun notmuch-show-w3m-cid-retrieve (url &rest args)\r
 133             (setq content (notmuch-get-bodypart-internal (notmuch-id-to-query message-id)\r
 134                                                               part-number notmuch-show-process-crypto))\r
 135             (with-current-buffer w3m-current-buffer\r
 136 -             (notmuch-show-w3m-cid-store-internal url\r
 137 -                                                  message-id\r
 138 -                                                  part-number\r
 139 -                                                  content-type\r
 140 -                                                  content)))\r
 141 +             (notmuch-show-w3m-cid-store-internal url msg part content)))\r
 142           (insert content)\r
 143           content-type)\r
 144        nil)))\r
 145 -- \r
 146 1.9.1\r
 147 \r