diff options
| author | Jonas Bernoulli <jonas@bernoul.li> | 2020-08-08 13:50:08 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-08-09 21:17:39 -0300 |
| commit | 6336c26d2341b390c995b5579bf590415db29420 (patch) | |
| tree | 9dab55a0f854d8dba13e0118eddc13181d205632 | |
| parent | 3665914f71fc7be2f537ec0ae2647f768c7f5bbe (diff) | |
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.
| -rw-r--r-- | emacs/notmuch-lib.el | 8 |
1 files changed, 3 insertions, 5 deletions
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 |