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

diff --git a/ba/5efb6ff45831d96d0e5d42c11b67581413954f b/ba/5efb6ff45831d96d0e5d42c11b67581413954f
new file mode 100644 (file)
index 0000000..90d989d
--- /dev/null
+++ b/ba/5efb6ff45831d96d0e5d42c11b67581413954f
@@ -0,0 +1,113 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 98C9E431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Jan 2014 13:31:16 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 4onoLDJoZCpz for <notmuch@notmuchmail.org>;\r
+       Tue, 28 Jan 2014 13:31:09 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 4E972431FBD\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Jan 2014 13:31:09 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1W8GFJ-0004IO-Lz; Tue, 28 Jan 2014 21:31:04 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1W8GEB-0004kw-Bx; Tue, 28 Jan 2014 21:29:51 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/1] emacs: ad-activate 'mm-shr after ad-disable-advice\r
+       'mm-shr\r
+In-Reply-To: <1390854732-7501-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1390854732-7501-1-git-send-email-tomi.ollila@iki.fi>\r
+User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 28 Jan 2014 21:28:09 +0000\r
+Message-ID: <87ha8n94pi.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-Geographic: According to ripencc,\r
+       this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: f18867dbd04050039e566b9b2650eaab (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored 0.0 points. Summary of the scoring: \r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Tue, 28 Jan 2014 21:31:16 -0000\r
+\r
+\r
+Hi\r
+\r
+This LGTM (but untested)\r
+\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+On Mon, 27 Jan 2014, Tomi Ollila <tomi.ollila@iki.fi> wrote:\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r