Re: [PATCH v2] emacs: Don't override mm-show-part in notmuch-show-view-part

diff --git a/00/1aa320e9343e35cde02b1259393d6fcd439360 b/00/1aa320e9343e35cde02b1259393d6fcd439360
new file mode 100644 (file)
index 0000000..207a6c5
--- /dev/null
+++ b/00/1aa320e9343e35cde02b1259393d6fcd439360
@@ -0,0 +1,119 @@
+Return-Path: <tomi.ollila@iki.fi>\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 6B2D6431FBF\r
+       for <notmuch@notmuchmail.org>; Sun, 26 May 2013 00:31:26 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 fYo7VQi5lImW for <notmuch@notmuchmail.org>;\r
+       Sun, 26 May 2013 00:31:18 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 85E60431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 26 May 2013 00:31:17 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 4E39E100093;\r
+       Sun, 26 May 2013 10:31:13 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] emacs: Don't override mm-show-part in\r
+       notmuch-show-view-part\r
+In-Reply-To: <1369550086-26986-1-git-send-email-amdragon@mit.edu>\r
+References: <8761ycc19t.fsf@qmul.ac.uk>\r
+       <1369550086-26986-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.15.2+115~g12cf6af (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 26 May 2013 10:31:13 +0300\r
+Message-ID: <m238takxj2.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 26 May 2013 07:31:26 -0000\r
+\r
+On Sun, May 26 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+\r
+> Previously, notmuch-show-view-part overrode the function binding of\r
+> mm-show-part to redirect it to notmuch-show-save-part to get notmuch's\r
+> default file name handling in case mm-display-part decided to fall\r
+> back to saving the part.  In addition to being messy, this depended on\r
+> the now-deprecated dynamic binding behavior of flet.\r
+>\r
+> This patch removes the mm-show-part override in favor of passing the\r
+> file name in to mm-show-part the way it expects, so we get its default\r
+> file name handling.  It's not clear why we didn't do this before;\r
+> mm-show-part has supported default file names since at least Emacs\r
+> 23.1.\r
+> ---\r
+> This version overrides the default save directory to make it\r
+> consistent with `notmuch-show-save-part'.\r
+\r
+LGTM. +1.\r
+\r
+Tomi\r
+\r
+\r
+>\r
+>  emacs/notmuch-show.el |   23 +++++++++--------------\r
+>  1 file changed, 9 insertions(+), 14 deletions(-)\r
+>\r
+> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+> index 423dd58..d773396 100644\r
+> --- a/emacs/notmuch-show.el\r
+> +++ b/emacs/notmuch-show.el\r
+> @@ -528,20 +528,15 @@ message at DEPTH in the current thread."\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. We need to lexically bind\r
+> -      ;; everything we need for notmuch-show-save-part to prevent\r
+> -      ;; potential dynamic shadowing.\r
+> -      (lexical-let ((message-id message-id)\r
+> -                (nth nth)\r
+> -                (filename filename)\r
+> -                (content-type content-type))\r
+> -    (flet ((mm-save-part (&rest args) (notmuch-show-save-part\r
+> -                                       message-id nth filename content-type)))\r
+> -      (mm-display-part handle))))))\r
+> +    (let* ((disposition (if filename `(attachment (filename . ,filename))))\r
+> +       (handle (mm-make-handle (current-buffer) (list content-type)\r
+> +                               nil nil disposition))\r
+> +       ;; Set the default save directory to be consistent with\r
+> +       ;; `notmuch-show-save-part'.\r
+> +       (mm-default-directory (or mailcap-download-directory "~/"))\r
+> +       ;; set mm-inlined-types to nil to force an external viewer\r
+> +       (mm-inlined-types nil))\r
+> +      (mm-display-part handle))))\r
+>  \r
+>  (defun notmuch-show-interactively-view-part (message-id nth &optional filename content-type)\r
+>    (notmuch-with-temp-part-buffer message-id nth\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r