[PATCH] emacs: Avoid deprecated function flet

diff --git a/d2/48b10cd6cd74ea600d97fc73022abfb61eb0cf b/d2/48b10cd6cd74ea600d97fc73022abfb61eb0cf
new file mode 100644 (file)
index 0000000..3482f45
--- /dev/null
+++ b/d2/48b10cd6cd74ea600d97fc73022abfb61eb0cf
@@ -0,0 +1,102 @@
+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 136B9431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 19 May 2013 08:14:29 -0700 (PDT)\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 PDrpppA9FV4l for <notmuch@notmuchmail.org>;\r
+       Sun, 19 May 2013 08:14:21 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+       [18.9.25.14])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3E459431FBC\r
+       for <notmuch@notmuchmail.org>; Sun, 19 May 2013 08:14:21 -0700 (PDT)\r
+X-AuditID: 1209190e-b7f4f6d000005142-4c-5198ec4b0af8\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 7C.86.20802.B4CE8915; Sun, 19 May 2013 11:14:19 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH-1.MIT.EDU [18.9.28.11])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r4JFEHOq032646; \r
+       Sun, 19 May 2013 11:14:17 -0400\r
+Received: from drake.dyndns.org (dhcp-18-111-73-150.dyn.mit.edu\r
+       [18.111.73.150]) (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 r4JFEEF1022313\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 19 May 2013 11:14:16 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1Ue5JO-0001Ll-FM; Sun, 19 May 2013 11:14:14 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: Avoid deprecated function flet\r
+Date: Sun, 19 May 2013 11:14:07 -0400\r
+Message-Id: <1368976447-5153-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <87vc6fjjdp.fsf@zancas.localnet>\r
+References: <87vc6fjjdp.fsf@zancas.localnet>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrOv9ZkagwecdXBY3WrsZLa7fnMns\r
+       wOTxbNUtZo8th94zBzBFcdmkpOZklqUW6dslcGVMOPmNteARZ8XUN3NZGxi/s3cxcnJICJhI\r
+       7Gq/zAJhi0lcuLeerYuRi0NIYB+jRNOnwywQzkZGiQ0f34JVCQkcY5J48iscIjGXUeLD7vVM\r
+       IAk2AQ2JbfuXM4LYIgLSEjvvzmYFsZkFLCWufm0HqxEWMJOYteorWA2LgKrEy0nv2UBsXgF7\r
+       idbJc1ghzlCU6H42ASzOKaArsWDKfHaIxToS3zrfM01g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4\r
+       OTEvL7VI11gvN7NELzWldBMjOJQk+XYwfj2odIhRgINRiYdX4930QCHWxLLiytxDjJIcTEqi\r
+       vE9fzQgU4kvKT6nMSCzOiC8qzUktPsQowcGsJMJbDpLjTUmsrEotyodJSXOwKInzXkm56S8k\r
+       kJ5YkpqdmlqQWgSTleHgUJLgLXgN1ChYlJqeWpGWmVOCkGbi4AQZzgM0fBnY8OKCxNzizHSI\r
+       /ClGRSlx3jyQZgGQREZpHlwvLNZfMYoDvSLM+wqkigeYJuC6XwENZgIazHptKsjgkkSElFQD\r
+       46q3Fh8ur1439+wkxv5z4lubDuqV60um2R2b0/5lS/j5wAtS3AHGAlePbLh6QXNDtAF/YUi3\r
+       9ufnM3Xzv+lktdjq32Zo5Gz1d7y4WSej/edL6ewLd7d7teWZ6+kKJs0OrtEUathsrV2eK6j3\r
+       vufJtBh/lfwlk44Z1uZM7/jklsGioDNLVl5EiaU4I9FQi7moOBEA1IKbG9ACAAA=\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: Sun, 19 May 2013 15:14:29 -0000\r
+\r
+flet was deprecated in Emacs 24.3 and replaced with cl-flet.  However,\r
+cl-flet lexically binds the function symbol, while we depend on flet\r
+dynamically binding the function symbol.  Hence, this patch replaces\r
+the deprecated flet use with letf, which lets us dynamically bind the\r
+function symbol, while remaining compatible with both Emacs 23 and 24.\r
+\r
+Since we don't have an automated test for this, this was tested\r
+manually in Emacs 24.3 and 23.4.\r
+---\r
+ emacs/notmuch-show.el |    5 +++--\r
+ 1 file changed, 3 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 423dd58..7101236 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -539,8 +539,9 @@ message at DEPTH in the current thread."\r
+                   (nth nth)\r
+                   (filename filename)\r
+                   (content-type content-type))\r
+-      (flet ((mm-save-part (&rest args) (notmuch-show-save-part\r
+-                                         message-id nth filename content-type)))\r
++      (letf (((symbol-function 'mm-save-part)\r
++              (lambda (&rest args) (notmuch-show-save-part\r
++                                    message-id nth filename content-type))))\r
+         (mm-display-part handle))))))\r
+ \r
+ (defun notmuch-show-interactively-view-part (message-id nth &optional filename content-type)\r
+-- \r
+1.7.10.4\r
+\r