From 3273407baaf573236cfe2921b82f775c59e3c5ba Mon Sep 17 00:00:00 2001
From: Daniel Borchmann <daniel@algebra20.de>
Date: Sun, 27 Jan 2019 13:42:10 +0100
Subject: [PATCH] =?UTF-8?q?[Misc]=20Move=20configuration=20for=20=E2=80=98?=
 =?UTF-8?q?mm-decode=E2=80=99=20to=20init.el?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gnus.el | 18 ------------------
 init.el | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/gnus.el b/gnus.el
index 004cf69..cdab12e 100644
--- a/gnus.el
+++ b/gnus.el
@@ -299,11 +299,6 @@ parameters for one particular email address."
 ;;; MIME
 
 (setq gnus-ignored-mime-types '("text/x-vcard")
-      mm-discouraged-alternatives '("text/richtext" "text/html")
-      mm-automatic-display (-difference mm-automatic-display
-                                        '("text/html"
-                                          "text/enriched"
-                                          "text/richtext"))
       message-forward-as-mime t
       gnus-inhibit-mime-unbuttonizing nil
       gnus-buttonized-mime-types '("multipart/signed" "multipart/encrypted")
@@ -316,19 +311,6 @@ parameters for one particular email address."
           (insert "ghItlhpu' " (mail-header-from message-reply-headers) ":")
           (newline))))
 
-(use-package mm-decode
-  :config (progn
-            ;; Tells Gnus to inline the part
-            (add-to-list 'mm-inlined-types "application/pgp$")
-            ;; Tells Gnus how to display the part when it is requested
-            (add-to-list 'mm-inline-media-tests
-                         '("application/pgp$" mm-inline-text identity))
-            ;; Tell Gnus not to wait for a request, just display the thing
-            ;; straight away.
-            (add-to-list 'mm-automatic-display "application/pgp$")
-
-            (setq mm-text-html-renderer 'shr)))
-
 
 ;;; Signing and Encryption
 
diff --git a/init.el b/init.el
index dee6275..80b10b7 100644
--- a/init.el
+++ b/init.el
@@ -1224,6 +1224,23 @@
             (bbdb-initialize 'gnus 'message)
             (bbdb-mua-auto-update-init 'message)))
 
+(use-package mm-decode
+  :init (setq mm-text-html-renderer 'shr
+              mm-discouraged-alternatives '("text/richtext" "text/html")
+              mm-automatic-display (-difference mm-automatic-display
+                                                '("text/html"
+                                                  "text/enriched"
+                                                  "text/richtext")))
+  :config (progn
+            ;; Tells Gnus to inline the PGP data
+            (add-to-list 'mm-inlined-types "application/pgp$")
+            ;; Tells Gnus how to display PGP data when it is requested
+            (add-to-list 'mm-inline-media-tests
+                         '("application/pgp$" mm-inline-text identity))
+            ;; Tell Gnus not to wait for a request, just display PGP data
+            ;; straight away.
+            (add-to-list 'mm-automatic-display "application/pgp$")))
+
 (use-package mm-view
   :config (progn
             ;; Fix: mm-view does not seem to support verifying S/MIME messages