From c6f2bf5333485f48fbd098c15626608bd651ceac Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Tue, 20 Apr 2021 10:54:41 +0300
Subject: [PATCH] Revert "mu4e-view-gnus: refactor message rendering code a
 bit"

This reverts commit 515af3e3d2d24579214806ba5c4e8bf776847c5d, since it
broke the attachments display.
---
 mu4e/mu4e-view-gnus.el | 63 +++++++++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/mu4e/mu4e-view-gnus.el b/mu4e/mu4e-view-gnus.el
index 9309598e..8dcc247b 100644
--- a/mu4e/mu4e-view-gnus.el
+++ b/mu4e/mu4e-view-gnus.el
@@ -75,17 +75,26 @@ Note that cid images that are embedded in a message won’t be blocked."
         (inhibit-read-only t)
         (mm-decrypt-option 'known)
         (gnus-article-emulate-mime t)
-        (gnus-buttonized-mime-types
-         (append (list "multipart/signed"
-                       "multipart/encrypted") gnus-buttonized-mime-types)))
+        (gnus-buttonized-mime-types (append (list "multipart/signed"
+                                                  "multipart/encrypted")
+                                            gnus-buttonized-mime-types)))
     (setq mu4e~view-buffer-name gnus-article-buffer)
     (switch-to-buffer (get-buffer-create mu4e~view-buffer-name))
     (buffer-disable-undo)
+    (insert-file-contents-literally path nil nil nil t)
+    (mm-enable-multibyte)
     (setq
      gnus-summary-buffer (get-buffer-create " *appease-gnus*")
      gnus-original-article-buffer (current-buffer)
      mu4e~view-message msg)
-    (mu4e~view-path path)
+    (let* ((ct (mail-fetch-field "Content-Type"))
+           (ct (and ct (mail-header-parse-content-type ct)))
+           (charset (mail-content-type-get ct 'charset))
+           (charset (and charset (intern charset)))
+           (gnus-newsgroup-charset
+            (if (and charset (coding-system-p charset)) charset
+              (detect-coding-region (point-min) (point-max) t))))
+      (run-hooks 'gnus-article-decode-hook))
     (let ((mu4e~view-rendering t) ; customize gnus in mu4e
           (max-specpdl-size mu4e-view-max-specpdl-size)
           (gnus-blocked-images (mu4e-view-blocked-images-fn msg))
@@ -99,33 +108,11 @@ Note that cid images that are embedded in a message won’t be blocked."
     (setq mu4e~view-rendering t); Needed if e.g. an ics file is buttonized
     (setq mu4e~gnus-article-mime-handles gnus-article-mime-handles)
     (mu4e~view-activate-urls)
+    ;; `mu4e-view-mode' derives from `gnus-article-mode'.
+    (setq gnus-article-decoded-p gnus-article-decode-hook)
     (set-buffer-modified-p nil)
     (add-hook 'kill-buffer-hook #'mu4e~view-kill-buffer-hook-fn)))
 
-
-(defun mu4e-view-message-text (msg)
-  "Return the MSG as a string, for replying/forwarding etc.."
-  (with-temp-buffer
-    (mu4e~view-path (mu4e-message-field msg :path))
-    (buffer-string)))
-
-(defun mu4e~view-path (path)
-  "View the message at PATH."
-  (insert-file-contents-literally path nil nil nil t)
-  (mm-enable-multibyte)
-  (let* ((ct (mail-fetch-field "Content-Type"))
-         (ct (and ct (mail-header-parse-content-type ct)))
-         (charset (mail-content-type-get ct 'charset))
-         (charset (and charset (intern charset)))
-         (gnus-newsgroup-charset
-          (if (and charset (coding-system-p charset)) charset
-            (detect-coding-region (point-min) (point-max) t))))
-        (run-hooks 'gnus-article-decode-hook)
-        (mu4e-view-mode)
-        (gnus-article-prepare-display)))
-
-
-
 (defun mu4e-view-blocked-images-fn (msg)
   (if (functionp mu4e-view-blocked-images)
       (funcall mu4e-view-blocked-images msg)
@@ -430,6 +417,26 @@ Gnus' article-mode."
   (advice-add 'gnus-msg-mail :around #'mu4e~view-msg-mail)
   (mu4e~view-mode-body))
 
+(defun mu4e-view-message-text (msg)
+  "Return the message as a string, for replying/forwarding etc.."
+  (with-temp-buffer
+    (let ((path (mu4e-message-field msg :path))
+          (inhibit-read-only t)
+          (gnus-article-emulate-mime t))
+      (buffer-disable-undo)
+      (insert-file-contents-literally path nil nil nil t)
+      (mm-enable-multibyte)
+      (let* ((ct (mail-fetch-field "Content-Type"))
+             (ct (and ct (mail-header-parse-content-type ct)))
+             (charset (mail-content-type-get ct 'charset))
+             (charset (and charset (intern charset)))
+             (gnus-newsgroup-charset
+              (if (and charset (coding-system-p charset)) charset
+                (detect-coding-region (point-min) (point-max) t))))
+        (run-hooks 'gnus-article-decode-hook))
+      (gnus-article-prepare-display)
+      (buffer-string))))
+
 ;;; Massaging the message view
 
 (defcustom mu4e-view-massage-options