Re: [PATCH v3] Make buttons for attachments allow viewing as well as saving

diff --git a/fb/deb37e0a1396594fe8ac46f83d31815a175efa b/fb/deb37e0a1396594fe8ac46f83d31815a175efa
new file mode 100644 (file)
index 0000000..71d348a
--- /dev/null
+++ b/fb/deb37e0a1396594fe8ac46f83d31815a175efa
@@ -0,0 +1,104 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 53656429E5F\r
+       for <notmuch@notmuchmail.org>; Tue, 17 Jan 2012 16:39:37 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 gmxJweDiFqLB for <notmuch@notmuchmail.org>;\r
+       Tue, 17 Jan 2012 16:39:37 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\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 C0DEC429E27\r
+       for <notmuch@notmuchmail.org>; Tue, 17 Jan 2012 16:39:36 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1RnJYs-00072v-Tx; Wed, 18 Jan 2012 00:39:35 +0000\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1RnJYs-0007CO-Mx; Wed, 18 Jan 2012 00:39:34 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Austin Clements <amdragon@MIT.EDU>\r
+Subject: Re: [PATCH v3] Make buttons for attachments allow viewing as well as\r
+       saving\r
+In-Reply-To: <20120117235318.GZ16740@mit.edu>\r
+References: <87lip5rj43.fsf@qmul.ac.uk>\r
+       <1326843886-18387-1-git-send-email-markwalters1009@gmail.com>\r
+       <20120117235318.GZ16740@mit.edu>\r
+User-Agent: Notmuch/0.11~rc2+73~g1ea2b60 (http://notmuchmail.org) Emacs/23.2.1\r
+       (i486-pc-linux-gnu)\r
+Date: Wed, 18 Jan 2012 00:40:22 +0000\r
+Message-ID: <87ipk9rgg9.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: 821e29e0240c6907a76ad32d1df5de16 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.6 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+Cc: notmuch@notmuchmail.org\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: Wed, 18 Jan 2012 00:39:37 -0000\r
+\r
+\r
+> Oof, sorry.  Two more tweaks that I really should have caught in the\r
+> previous version.  After that this gets my automatic +1.\r
+\r
+Both fixed. I have also fixed the bug I mentioned (missing filename when\r
+"view" falls back on save); I couldn't make it work with the\r
+"no-default" option. However overriding mm-save-part with flet seems to\r
+do the trick.\r
+\r
++(defun notmuch-show-view-part (message-id nth &optional filename content-type )\r
++  (notmuch-with-temp-part-buffer message-id nth\r
++    ;; set mm-inlined-types to nil to force an external viewer\r
++    (let ((handle (mm-make-handle (current-buffer) (list content-type)))\r
++         (mm-inlined-types nil))\r
++      ;; We override mm-save-part as notmuch-show-save-part is better\r
++      ;; since it offers the filename\r
++      (flet ((mm-save-part (&rest args) (ignore)))\r
++           (or (mm-display-part handle)\r
++               (notmuch-show-save-part message-id nth filename content-type))))))\r
+\r
+Is that a reasonable solution? \r
+\r
+Best wishes\r
+\r
+Mark\r