Before the change, there was a workaround to avoid notmuch show calls
for parts with application/* Content-Type. But non-inlinable parts
are not limited to this Content-Type (e.g. mp3 files have audio/mpeg
Content-Type and are not inlinable). For such parts
`notmuch-show-insert-part-*/*' handler is called which unconditionally
fetches contents for all parts.
The patch moves content fetching from `notmuch-show-insert-part-*/*'
to `notmuch-show-mm-display-part-inline' function after MIME inlinable
checks are done to avoid useless notmuch show calls. The
application/* hack is no longer needed and removed.
---
emacs/notmuch-show.el | 17 +++++------------
test/emacs | 1 -
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index d7fbbca..d2d4968 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -320,17 +320,17 @@ message at DEPTH in the current thread."
;; ange-ftp, which is reasonable to use here.
(mm-write-region (point-min) (point-max) file nil nil nil
'no-conversion t)))))
-(defun notmuch-show-mm-display-part-inline (msg part content-type content)
+(defun notmuch-show-mm-display-part-inline (msg part nth content-type)
"Use the mm-decode/mm-view functions to display a part in the
current buffer, if possible."
(let ((display-buffer (current-buffer)))
(with-temp-buffer
- (insert content)
(let ((handle (mm-make-handle (current-buffer) (list content-type))))
- (set-buffer display-buffer)
(if (and (mm-inlinable-p handle)
(mm-inlined-p handle))
- (progn
+ (let ((content (notmuch-show-get-bodypart-content msg part nth)))
+ (insert content)
+ (set-buffer display-buffer)
(mm-display-part handle)
t)
nil)))))
@@ -588,17 +588,10 @@ current buffer, if possible."
nil))
nil))))
-(defun notmuch-show-insert-part-application/* (msg part content-type nth depth
declared-type
-)
- ;; do not render random "application" parts
- (notmuch-show-insert-part-header nth content-type declared-type (plist-get
part :filename)))
-
(defun notmuch-show-insert-part-*/* (msg part content-type nth depth
declared-type)
;; This handler _must_ succeed - it is the handler of last resort.
(notmuch-show-insert-part-header nth content-type declared-type (plist-get
part :filename))
- (let ((content (notmuch-show-get-bodypart-content msg part nth)))
- (if content
- (notmuch-show-mm-display-part-inline msg part content-type content)))
+ (notmuch-show-mm-display-part-inline msg part nth content-type)
t)
;; Functions for determining how to handle MIME parts.
diff --git a/test/emacs b/test/emacs
index 20f8449..56ca87b 100755
--- a/test/emacs
+++ b/test/emacs
@@ -488,7 +488,6 @@ test_emacs "(let ((notmuch-command
\"$notmuch_counter_command\"))
test_expect_equal $(notmuch_counter_value) 1
test_begin_subtest "Do not call notmuch for non-inlinable audio/mpeg parts"
-test_subtest_known_broken
id='message-with-audio/mpeg-attachment at notmuchmail.org'
emacs_deliver_message \
'Message with audio/mpeg attachment' \
--
1.7.7.3
