From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sat, 8 Aug 2020 11:50:08 +0000 (+0200)
Subject: emacs: Use new advice mechanism do advice mm-shr
X-Git-Tag: 0.31_rc0~12
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6336c26d2341b390c995b5579bf590415db29420

emacs: Use new advice mechanism do advice mm-shr

Also because we now only support Emacs >= 25,
we can remove the check for Emacs >= 24.
---

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 91c94781..118faf1e 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -661,11 +661,9 @@ MSG (if it isn't already)."
 ;; first loading gnus-art, which defines it, resulting in a
 ;; void-variable error.  Hence, we advise `mm-shr' to ensure gnus-art
 ;; is loaded.
-(when (>= emacs-major-version 24)
-  (defadvice mm-shr (before load-gnus-arts activate)
-    (require 'gnus-art nil t)
-    (ad-disable-advice 'mm-shr 'before 'load-gnus-arts)
-    (ad-activate 'mm-shr)))
+(define-advice mm-shr (:before (_handle) notmuch--load-gnus-args)
+  "Require `gnus-art' since we use its variables."
+  (require 'gnus-art nil t))
 
 (defun notmuch-mm-display-part-inline (msg part content-type process-crypto)
   "Use the mm-decode/mm-view functions to display a part in the