LGTM +1 This does not rely on the followup Austin mentioned in id:20130526063627.GQ5999@mit.edu is so I think this should go in as is as it fixes the flet thing without changing the behaviour. Best wishes Mark On Sun, 26 May 2013, Austin Clements <amdragon@MIT.EDU> wrote: > 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. > --- > This version overrides the default save directory to make it > consistent with `notmuch-show-save-part'. > > emacs/notmuch-show.el | 23 +++++++++-------------- > 1 file changed, 9 insertions(+), 14 deletions(-) > > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el > index 423dd58..d773396 100644 > --- a/emacs/notmuch-show.el > +++ b/emacs/notmuch-show.el > @@ -528,20 +528,15 @@ message at DEPTH in the current thread." > > (defun notmuch-show-view-part (message-id nth &optional filename content-type ) > (notmuch-with-temp-part-buffer message-id nth > - ;; set mm-inlined-types to nil to force an external viewer > - (let ((handle (mm-make-handle (current-buffer) (list content-type))) > - (mm-inlined-types nil)) > - ;; We override mm-save-part as notmuch-show-save-part is better > - ;; since it offers the filename. We need to lexically bind > - ;; everything we need for notmuch-show-save-part to prevent > - ;; potential dynamic shadowing. > - (lexical-let ((message-id message-id) > - (nth nth) > - (filename filename) > - (content-type content-type)) > - (flet ((mm-save-part (&rest args) (notmuch-show-save-part > - message-id nth filename content-type))) > - (mm-display-part handle)))))) > + (let* ((disposition (if filename `(attachment (filename . ,filename)))) > + (handle (mm-make-handle (current-buffer) (list content-type) > + nil nil disposition)) > + ;; Set the default save directory to be consistent with > + ;; `notmuch-show-save-part'. > + (mm-default-directory (or mailcap-download-directory "~/")) > + ;; set mm-inlined-types to nil to force an external viewer > + (mm-inlined-types nil)) > + (mm-display-part handle)))) > > (defun notmuch-show-interactively-view-part (message-id nth &optional filename content-type) > (notmuch-with-temp-part-buffer message-id nth > -- > 1.7.10.4