alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mu4e-view: tweak html toggling

Browse Source 
Ensure the buffer is marked as writable when doing the switch.
This commit is contained in:
Dirk-Jan C. Binnema
2026-04-14 22:19:10 +03:00
committed by Seth Ladygo
parent c491d9c1e0
commit 94cfb201f0
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
mu4e/mu4e-view.el
View File

@ -481,7 +481,8 @@ As a side-effect, a message that is being viewed loses its
(let ((inhibit-read-only t) (let ((inhibit-read-only t)
(gnus-unbuttonized-mime-types '(".*/.*")) (gnus-unbuttonized-mime-types '(".*/.*"))
(gnus-buttonized-mime-types (gnus-buttonized-mime-types
(append (list "multipart/signed" "multipart/encrypted") (append (list "multipart/signed" "multipart/encrypted"
"multipart/alternative")
gnus-buttonized-mime-types)) gnus-buttonized-mime-types))
(gnus-inhibit-mime-unbuttonizing mu4e--view-show-mime-buttons)) (gnus-inhibit-mime-unbuttonizing mu4e--view-show-mime-buttons))
(erase-buffer) (erase-buffer)
@ -1044,30 +1045,35 @@ Article Treatment' for more options."
(funcall (mu4e-read-option "Massage: " mu4e-view-massage-options))) (funcall (mu4e-read-option "Massage: " mu4e-view-massage-options)))
(defun mu4e-view-toggle-html () (defun mu4e-view-toggle-html ()
"Toggle html-display of the first html-part found." "Toggle between the HTML and plain-text alternatives.
Works for `multipart/alternative' messages by pressing the
corresponding Gnus selector button in the buffer."
(interactive) (interactive)
;; This function assumes `gnus-article-mime-handle-alist' is sorted by
;; pertinence, i.e. the first HTML part found in it is the most important one.
(save-excursion (save-excursion
(if-let*((html-part (let ((inhibit-read-only t))
(seq-find (lambda (handle) (if-let* ((alt (seq-find
(equal (mm-handle-media-type (cdr handle)) (lambda (h)
"text/html")) (equal (mm-handle-media-type (cdr h))
gnus-article-mime-handle-alist)) "multipart/alternative"))
(text-part gnus-article-mime-handle-alist))
(seq-find (lambda (handle) (children (cdr (cdr alt)))
(equal (mm-handle-media-type (cdr handle)) (html (seq-find
"text/plain")) (lambda (h) (equal (mm-handle-media-type h) "text/html"))
gnus-article-mime-handle-alist))) children))
(progn (plain (seq-find
;; Call gnus-mime-inline-part directly, bypassing (lambda (h) (equal (mm-handle-media-type h) "text/plain"))
;; gnus-article-part-wrapper which requires gnus-summary-buffer. children))
(gnus-mime-inline-part (cdr html-part)) (target (if (mm-handle-displayed-p html) plain html))
;; Activate or deactivate URLs depending on the new state. (pos (text-property-any (point-min) (point-max)
(if (mu4e--view-html-displayed-p) 'gnus-data target)))
(mu4e--view-remove-url-activations) (progn
(mu4e--view-activate-urls))) (goto-char pos)
(mu4e-warn "Cannot switch; no html and/or text part in this message")))) (gnus-article-press-button)
(if (mm-handle-displayed-p html)
(mu4e--view-remove-url-activations)
(mu4e--view-activate-urls)))
(mu4e-warn
"Cannot switch; no html and/or text part in this message")))))
;;; Bug Reference mode support ;;; Bug Reference mode support
;; Due to mu4e's view buffer handling (mu4e-view-mode is called long before the ;; Due to mu4e's view buffer handling (mu4e-view-mode is called long before the