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

diff --git a/9f/7a71107e675cbdc13df6417ff59c4d8463a5ec b/9f/7a71107e675cbdc13df6417ff59c4d8463a5ec
new file mode 100644 (file)
index 0000000..f730961
--- /dev/null
+++ b/9f/7a71107e675cbdc13df6417ff59c4d8463a5ec
@@ -0,0 +1,117 @@
+Return-Path: <amdragon@mit.edu>\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 11631431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Jan 2014 14:36:12 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 bBAIleMNM1cZ for <notmuch@notmuchmail.org>;\r
+       Tue, 28 Jan 2014 14:36:03 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (dmz-mailsec-scanner-3.mit.edu\r
+       [18.9.25.14])\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 94DC4431FBD\r
+       for <notmuch@notmuchmail.org>; Tue, 28 Jan 2014 14:36:03 -0800 (PST)\r
+X-AuditID: 1209190e-f79ee6d000000c40-5f-52e830d20609\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 9E.E7.03136.2D038E25; Tue, 28 Jan 2014 17:36:02 -0500 (EST)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s0SMa0xp007923; \r
+       Tue, 28 Jan 2014 17:36:01 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s0SMZwc9014540\r
+       (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
+       Tue, 28 Jan 2014 17:36:00 -0500\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1W8HG5-0001YW-74; Tue, 28 Jan 2014 17:35:57 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\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.17~rc2+14~g06f47e0 (http://notmuchmail.org) Emacs/23.4.1\r
+       (i486-pc-linux-gnu)\r
+Date: Tue, 28 Jan 2014 17:35:51 -0500\r
+Message-ID: <87ob2vn394.fsf@awakening.csail.mit.edu>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsUixG6nrnvJ4EWQQf9NbYvrN2cyW7xZOY/V\r
+       gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4MrYv/Qye8E/zoqr15YxNzB2cXQxcnJICJhI\r
+       nJp9kRHCFpO4cG89WxcjF4eQwGwmiZWNW6GcjYwSez+dZ4RwTjNJzP7eyQLhLGGUaFp9igWk\r
+       n01AQ2Lb/uVgs0QEbCWuLDnJ2sXIwcEMNLd9XghIWFggWKLpzlywEk4BJ4m223fZQUqEBBwl\r
+       Tr+QAAmLCiRJnJ76mxXEZhFQldh0/zlYOS/Qpcc7tjJB2IISJ2c+AdvKLKAlcePfS6YJjIKz\r
+       kKRmIUktYGRaxSibklulm5uYmVOcmqxbnJyYl5dapGusl5tZopeaUrqJERSonJJ8Oxi/HlQ6\r
+       xCjAwajEwxtw/nmQEGtiWXFl7iFGSQ4mJVHe5XIvgoT4kvJTKjMSizPii0pzUosPMUpwMCuJ\r
+       8E6XBMrxpiRWVqUW5cOkpDlYlMR5b3LYBwkJpCeWpGanphakFsFkZTg4lCR4r+oDNQoWpaan\r
+       VqRl5pQgpJk4OEGG8wANfwlSw1tckJhbnJkOkT/FqCglzmsGkhAASWSU5sH1whLJK0ZxoFeE\r
+       ebeCVPEAkxBc9yugwUxAg1fuewIyuCQRISXVwKjQPWXt2XvHSqMXXfy6I2rOrcBJjQVPNYzq\r
+       mRPqdscsXHbdLKtLtWb+xZajfcvrJqx7vq3CP7bYJtRi9j+WzSoKYYKlW2Xy/9x3PMAbURE/\r
+       3UdzneQxY+3oWh8L7gpVxeL5B/lW6zIapq5Z16w2ZcNFkYq47/O/+rZkBhnJfjL78Kd5Y4/O\r
+       BSWW4oxEQy3mouJEALKeWM//AgAA\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 22:36:12 -0000\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
+Oops, looks like this was my fault.\r
+\r
+This fix LGTM.\r
+\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