d2/48b10cd6cd74ea600d97fc73022abfb61eb0cf

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 136B9431FBD\r
   6         for <notmuch@notmuchmail.org>; Sun, 19 May 2013 08:14:29 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id PDrpppA9FV4l for <notmuch@notmuchmail.org>;\r
  16         Sun, 19 May 2013 08:14:21 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 3E459431FBC\r
  20         for <notmuch@notmuchmail.org>; Sun, 19 May 2013 08:14:21 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7f4f6d000005142-4c-5198ec4b0af8\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 7C.86.20802.B4CE8915; Sun, 19 May 2013 11:14:19 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH-1.MIT.EDU [18.9.28.11])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r4JFEHOq032646; \r
  27         Sun, 19 May 2013 11:14:17 -0400\r
  28 Received: from drake.dyndns.org (dhcp-18-111-73-150.dyn.mit.edu\r
  29         [18.111.73.150]) (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r4JFEEF1022313\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Sun, 19 May 2013 11:14:16 -0400\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1Ue5JO-0001Ll-FM; Sun, 19 May 2013 11:14:14 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH] emacs: Avoid deprecated function flet\r
  40 Date: Sun, 19 May 2013 11:14:07 -0400\r
  41 Message-Id: <1368976447-5153-1-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.10.4\r
  43 In-Reply-To: <87vc6fjjdp.fsf@zancas.localnet>\r
  44 References: <87vc6fjjdp.fsf@zancas.localnet>\r
  45 X-Brightmail-Tracker:\r
  46  H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrOv9ZkagwecdXBY3WrsZLa7fnMns\r
  47         wOTxbNUtZo8th94zBzBFcdmkpOZklqUW6dslcGVMOPmNteARZ8XUN3NZGxi/s3cxcnJICJhI\r
  48         7Gq/zAJhi0lcuLeerYuRi0NIYB+jRNOnwywQzkZGiQ0f34JVCQkcY5J48iscIjGXUeLD7vVM\r
  49         IAk2AQ2JbfuXM4LYIgLSEjvvzmYFsZkFLCWufm0HqxEWMJOYteorWA2LgKrEy0nv2UBsXgF7\r
  50         idbJc1ghzlCU6H42ASzOKaArsWDKfHaIxToS3zrfM01g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4\r
  51         OTEvL7VI11gvN7NELzWldBMjOJQk+XYwfj2odIhRgINRiYdX4930QCHWxLLiytxDjJIcTEqi\r
  52         vE9fzQgU4kvKT6nMSCzOiC8qzUktPsQowcGsJMJbDpLjTUmsrEotyodJSXOwKInzXkm56S8k\r
  53         kJ5YkpqdmlqQWgSTleHgUJLgLXgN1ChYlJqeWpGWmVOCkGbi4AQZzgM0fBnY8OKCxNzizHSI\r
  54         /ClGRSlx3jyQZgGQREZpHlwvLNZfMYoDvSLM+wqkigeYJuC6XwENZgIazHptKsjgkkSElFQD\r
  55         46q3Fh8ur1439+wkxv5z4lubDuqV60um2R2b0/5lS/j5wAtS3AHGAlePbLh6QXNDtAF/YUi3\r
  56         9ufnM3Xzv+lktdjq32Zo5Gz1d7y4WSej/edL6ewLd7d7teWZ6+kKJs0OrtEUathsrV2eK6j3\r
  57         vufJtBh/lfwlk44Z1uZM7/jklsGioDNLVl5EiaU4I9FQi7moOBEA1IKbG9ACAAA=\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Sun, 19 May 2013 15:14:29 -0000\r
  71 \r
  72 flet was deprecated in Emacs 24.3 and replaced with cl-flet.  However,\r
  73 cl-flet lexically binds the function symbol, while we depend on flet\r
  74 dynamically binding the function symbol.  Hence, this patch replaces\r
  75 the deprecated flet use with letf, which lets us dynamically bind the\r
  76 function symbol, while remaining compatible with both Emacs 23 and 24.\r
  77 \r
  78 Since we don't have an automated test for this, this was tested\r
  79 manually in Emacs 24.3 and 23.4.\r
  80 ---\r
  81  emacs/notmuch-show.el |    5 +++--\r
  82  1 file changed, 3 insertions(+), 2 deletions(-)\r
  83 \r
  84 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
  85 index 423dd58..7101236 100644\r
  86 --- a/emacs/notmuch-show.el\r
  87 +++ b/emacs/notmuch-show.el\r
  88 @@ -539,8 +539,9 @@ message at DEPTH in the current thread."\r
  89                     (nth nth)\r
  90                     (filename filename)\r
  91                     (content-type content-type))\r
  92 -       (flet ((mm-save-part (&rest args) (notmuch-show-save-part\r
  93 -                                          message-id nth filename content-type)))\r
  94 +       (letf (((symbol-function 'mm-save-part)\r
  95 +               (lambda (&rest args) (notmuch-show-save-part\r
  96 +                                     message-id nth filename content-type))))\r
  97           (mm-display-part handle))))))\r
  98  \r
  99  (defun notmuch-show-interactively-view-part (message-id nth &optional filename content-type)\r
 100 -- \r
 101 1.7.10.4\r
 102 \r