debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-22 09:24:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: Use new advice mechanism do advice mm-shr

Browse source 
Also because we now only support Emacs >= 25,
we can remove the check for Emacs >= 24.
This commit is contained in:
Jonas Bernoulli 2020-08-08 13:50:08 +02:00 committed by David Bremner
parent 3665914f71
commit 6336c26d23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
emacs/notmuch-lib.el
View file

@ -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