Commit 356413bb authored by Katsumi Yamaoka's avatar Katsumi Yamaoka

Don't remove undisplayers from inlined MIME parts (bugfix)

* lisp/gnus/gnus-art.el (gnus-mime-buttonize-attachments-in-header):
Don't remove undisplayers from inlined MIME parts (bugfix);
Simplify criterion that finds attachments.
parent c5c9f5d7
......@@ -6366,7 +6366,7 @@ buttons to be added to the header are only the ones that aren't inlined
in the body. Use `gnus-header-face-alist' to highlight buttons."
(interactive (list t))
(gnus-with-article-buffer
(let ((case-fold-search t) buttons handle type st)
(let ((case-fold-search t) buttons st)
(save-excursion
(save-restriction
(widen)
......@@ -6387,22 +6387,7 @@ in the body. Use `gnus-header-face-alist' to highlight buttons."
;; Find buttons.
(setq buttons nil)
(dolist (button (gnus-article-mime-handles))
(setq handle (cdr button)
type (mm-handle-media-type handle))
(when (or (and (if (gnus-buffer-live-p gnus-summary-buffer)
(with-current-buffer gnus-summary-buffer
gnus-inhibit-images)
gnus-inhibit-images)
(string-match "\\`image/" type))
(mm-inline-override-p handle)
(and (mm-handle-disposition handle)
(not (equal (car (mm-handle-disposition handle))
"inline"))
(not (mm-attachment-override-p handle)))
(not (mm-automatic-display-p handle))
(not (or (and (mm-inlinable-p handle)
(mm-inlined-p handle))
(mm-automatic-external-display-p type))))
(unless (mm-handle-undisplayer (cdr button))
(push button buttons)))
(when buttons
;; Add header buttons.
......@@ -6413,8 +6398,7 @@ in the body. Use `gnus-header-face-alist' to highlight buttons."
(dolist (button (nreverse buttons))
(setq st (point))
(insert " ")
(mm-handle-set-undisplayer (setq handle (cdr button)) nil)
(gnus-insert-mime-button handle (car button))
(gnus-insert-mime-button (cdr button) (car button))
(skip-chars-backward "\t\n ")
(delete-region (point) (point-max))
(when (> (current-column) (window-width))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment