[PATCH 1/1] emacs: ad-activate 'mm-shr after ad-disable-advice 'mm-shr

diff --git a/92/c4a2e7c9902001ebf05c674d149b5bb617b652 b/92/c4a2e7c9902001ebf05c674d149b5bb617b652
new file mode 100644 (file)
index 0000000..0b9ab4e
--- /dev/null
+++ b/92/c4a2e7c9902001ebf05c674d149b5bb617b652
@@ -0,0 +1,69 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6897D431FBD\r
+       for <notmuch@notmuchmail.org>; Mon, 27 Jan 2014 12:32:25 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id KU08jBiswTJh for <notmuch@notmuchmail.org>;\r
+       Mon, 27 Jan 2014 12:32:19 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1E6D4431FBC\r
+       for <notmuch@notmuchmail.org>; Mon, 27 Jan 2014 12:32:19 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 98ADF10008B; Mon, 27 Jan 2014 22:32:14 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/1] emacs: ad-activate 'mm-shr after ad-disable-advice\r
+ 'mm-shr\r
+Date: Mon, 27 Jan 2014 22:32:12 +0200\r
+Message-Id: <1390854732-7501-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.8.0\r
+Cc: tomi.ollila@iki.fi\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 27 Jan 2014 20:32:25 -0000\r
+\r
+Imitated from "Enabling advice" in Emacs lisp manual...\r
+\r
+ad-disable-advice by itself only changes the enable flag for a\r
+piece of advice. To make the change take effect in the\r
+advised definition, the advice needs to be activated again.\r
+---\r
+ emacs/notmuch-lib.el | 3 ++-\r
+ 1 file changed, 2 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index e6e9f97..fa35fa9 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -531,7 +531,8 @@ the given type."\r
+ (if (>= emacs-major-version 24)\r
+     (defadvice mm-shr (before load-gnus-arts activate)\r
+       (require 'gnus-art nil t)\r
+-      (ad-disable-advice 'mm-shr 'before 'load-gnus-arts)))\r
++      (ad-disable-advice 'mm-shr 'before 'load-gnus-arts)\r
++      (ad-activate 'mm-shr)))\r
+ \r
+ (defun notmuch-mm-display-part-inline (msg part nth content-type process-crypto)\r
+   "Use the mm-decode/mm-view functions to display a part in the\r
+-- \r
+1.8.0\r
+\r