From 4ef6a53265efcb8e55d5281c295420f4a32cc43f Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 21 May 2013 20:13:09 +0100 Subject: [PATCH] Re: [PATCH] emacs: Don't override mm-show-part in notmuch-show-view-part --- 09/d3686d8f4ec0ff6a336b1a8bd105b85ef54232 | 139 ++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 09/d3686d8f4ec0ff6a336b1a8bd105b85ef54232 diff --git a/09/d3686d8f4ec0ff6a336b1a8bd105b85ef54232 b/09/d3686d8f4ec0ff6a336b1a8bd105b85ef54232 new file mode 100644 index 000000000..17c59e9fe --- /dev/null +++ b/09/d3686d8f4ec0ff6a336b1a8bd105b85ef54232 @@ -0,0 +1,139 @@ +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 1A50C431FBF + for ; Tue, 21 May 2013 12:13:24 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, 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 Biy5rqlOYmXL for ; + Tue, 21 May 2013 12:13:16 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 21F49431FB6 + for ; Tue, 21 May 2013 12:13:16 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1Uerzj-0004DM-Py; Tue, 21 May 2013 20:13:12 +0100 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1Uerzj-0000Sa-Gu; Tue, 21 May 2013 20:13:11 +0100 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH] emacs: Don't override mm-show-part in + notmuch-show-view-part +In-Reply-To: <8761ycc19t.fsf@qmul.ac.uk> +References: <20130520170439.GG5999@mit.edu> + <1369080503-6866-1-git-send-email-amdragon@mit.edu> + <8761ycc19t.fsf@qmul.ac.uk> +User-Agent: Notmuch/0.14+255~gff3cc55 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Tue, 21 May 2013 20:13:09 +0100 +Message-ID: <87fvxguoxm.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 704dfd3a37b3403df9acaeaf49637546 (of first 20000 bytes) +X-SpamAssassin-Score: -0.1 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -0.1 points. + Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.1 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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: Tue, 21 May 2013 19:13:24 -0000 + + +On Tue, 21 May 2013, Mark Walters wrote: +> Hi +> +>> Previously, notmuch-show-view-part overrode the function binding of +>> mm-show-part to redirect it to notmuch-show-save-part to get notmuch's +>> default file name handling in case mm-display-part decided to fall +>> back to saving the part. In addition to being messy, this depended on +>> the now-deprecated dynamic binding behavior of flet. +>> +>> This patch removes the mm-show-part override in favor of passing the +>> file name in to mm-show-part the way it expects, so we get its default +>> file name handling. It's not clear why we didn't do this before; +>> mm-show-part has supported default file names since at least Emacs +>> 23.1. +> +> The new code is much simpler (and nicer). However, one small annoyance +> is it makes notmuch-show-save-part and notmuch-show-view-part behave +> differently on parts which can only be saved (eg +> application/octet-stream): view-part (ie mm-save-part) offers the +> current directory (where emacs was started) whereas the notmuch +> save-part explicitly offers mailcap-download-directory or ~/. I have no +> preference which is used but think they should be the same. Perhaps +> notmuch-show-save-part could just call mm-save-part? I have tried that +> and the tests pass. (If we can do that I think the whole part button handling +> stuff could be unified/simplified significantly) + +Here is the code I was using to try using mm-save-part rather than our +own version. I don't know why we have our own version: this does pass +the tests and seems to work (though as mentioned above the semantics of +which default path is used are different) + +Best wishes + +Mark + +--- + emacs/notmuch-show.el | 13 ++++--------- + 1 files changed, 4 insertions(+), 9 deletions(-) + +diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +index 45039bd..a63b857 100644 +--- a/emacs/notmuch-show.el ++++ b/emacs/notmuch-show.el +@@ -516,15 +516,10 @@ message at DEPTH in the current thread." + + (defun notmuch-show-save-part (message-id nth &optional filename content-type) + (notmuch-with-temp-part-buffer message-id nth +- (let ((file (read-file-name +- "Filename to save as: " +- (or mailcap-download-directory "~/") +- nil nil +- filename))) +- ;; Don't re-compress .gz & al. Arguably we should make +- ;; `file-name-handler-alist' nil, but that would chop +- ;; ange-ftp, which is reasonable to use here. +- (mm-write-region (point-min) (point-max) file nil nil nil 'no-conversion t)))) ++ (let* ((disposition (if filename `(attachment (filename . ,filename)))) ++ (handle (mm-make-handle (current-buffer) (list content-type) ++ nil nil disposition))) ++ (mm-save-part handle)))) + + (defun notmuch-show-view-part (message-id nth &optional filename content-type ) + (notmuch-with-temp-part-buffer message-id nth +-- +1.7.9.1 + -- 2.26.2