From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Mon, 27 Jan 2014 20:32:12 +0000 (+0200)
Subject: emacs: ad-activate 'mm-shr after ad-disable-advice 'mm-shr
X-Git-Tag: 0.18_rc0~167
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ac863c549e8022dc06d73e07d79a74ec7f0569f;p=notmuch.git

emacs: ad-activate 'mm-shr after ad-disable-advice 'mm-shr

Imitated from "Enabling advice" in Emacs lisp manual...

ad-disable-advice by itself only changes the enable flag for a
piece of advice. To make the change take effect in the
advised definition, the advice needs to be activated again.
---

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index e6e9f97a..fa35fa9f 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -531,7 +531,8 @@ the given type."
 (if (>= 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-disable-advice 'mm-shr 'before 'load-gnus-arts)
+      (ad-activate 'mm-shr)))
 
 (defun notmuch-mm-display-part-inline (msg part nth content-type process-crypto)
   "Use the mm-decode/mm-view functions to display a part in the