fb/807bf64f9b390b2cc939a3f95fe88730050868

   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 44A40431FBD\r
   6         for <notmuch@notmuchmail.org>; Fri,  8 Aug 2014 08:11:32 -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: -2.3\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_MED=-2.3] 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 QoA+zdsNukWi for <notmuch@notmuchmail.org>;\r
  16         Fri,  8 Aug 2014 08:11:28 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
  18         [18.7.68.34])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 90904431FAE\r
  20         for <notmuch@notmuchmail.org>; Fri,  8 Aug 2014 08:11:28 -0700 (PDT)\r
  21 X-AuditID: 12074422-f79be6d000007518-13-53e4e89f04d4\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         (using TLS with cipher AES256-SHA (256/256 bits))\r
  24         (Client did not present a certificate)\r
  25         by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
  26         id 37.FE.29976.0A8E4E35; Fri,  8 Aug 2014 11:11:28 -0400 (EDT)\r
  27 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  28         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id s78FBQr0024751; \r
  29         Fri, 8 Aug 2014 11:11:26 -0400\r
  30 Received: from drake.dyndns.org\r
  31         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  32         [216.15.114.40]) (authenticated bits=0)\r
  33         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  34         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s78FBN6t008387\r
  35         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  36         Fri, 8 Aug 2014 11:11:25 -0400\r
  37 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  38         (envelope-from <amdragon@mit.edu>)\r
  39         id 1XFlpD-0004a6-Nk; Fri, 08 Aug 2014 11:11:23 -0400\r
  40 From: Austin Clements <amdragon@MIT.EDU>\r
  41 To: notmuch@notmuchmail.org\r
  42 Subject: [PATCH] emacs: Fix byte compile warning on Emacs < 24\r
  43 Date: Fri,  8 Aug 2014 11:11:20 -0400\r
  44 Message-Id: <1407510680-17576-1-git-send-email-amdragon@mit.edu>\r
  45 X-Mailer: git-send-email 2.0.0\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsUixG6norvgxZNgg//3WCyapjtbXL85k9mB\r
  48         yePW/dfsHs9W3WIOYIrisklJzcksSy3St0vgyvj+/CRbQQtnxa6W3SwNjOvYuxg5OSQETCSW\r
  49         HD3OBGGLSVy4t56ti5GLQ0hgNpPEtK2HmCCcDYwSh5ZNZoZwbjNJNG97zwrhzGWUuDnrCCNI\r
  50         P5uAhsS2/cvBbBEBaYmdd2cDFXFwMAuYS9xsiQMJCwvYSbyZuQFsHYuAqsSeRX0sIDavgIPE\r
  51         s1X9bBBnyEk03PjENoGRdwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdU73czBK91JTSTYzg\r
  52         wHBR2sH486DSIUYBDkYlHl6B7sfBQqyJZcWVuYcYJTmYlER5cw4+CRbiS8pPqcxILM6ILyrN\r
  53         SS0+xCjBwawkwvvkEVCONyWxsiq1KB8mJc3BoiTO+9baKlhIID2xJDU7NbUgtQgmK8PBoSTB\r
  54         m/IcqFGwKDU9tSItM6cEIc3EwQkynAdoeDFIDW9xQWJucWY6RP4Uo6KUOK/5M6CEAEgiozQP\r
  55         rhcWua8YxYFeEeadBtLOA4x6uO5XQIOZgAbLqj4GGVySiJCSamDMOKu5646pRKN1+ctn100X\r
  56         v6zL5V29o9a6YX3We5/H091ffmWZf+vkjakzy1tu5fUxG074JfpLrlmS71bi+/qUg4//8Yl9\r
  57         OXdjvoD/7w0Jrz8vibne/zD9ZOc1OZWc1I0134pfCilNWb1oE8/3De9Pau2Y80ri96yVHmmH\r
  58         nBpnOU/o6njw/tMrPyWW4oxEQy3mouJEAKMC4n63AgAA\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Fri, 08 Aug 2014 15:11:32 -0000\r
  72 \r
  73 Fix "Warning: the function `window-body-width' is not known to be\r
  74 defined." by moving our compatibility wrapper before its use.\r
  75 ---\r
  76  emacs/notmuch-jump.el | 12 ++++++------\r
  77  1 file changed, 6 insertions(+), 6 deletions(-)\r
  78 \r
  79 diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el\r
  80 index 05bbce5..35082a6 100644\r
  81 --- a/emacs/notmuch-jump.el\r
  82 +++ b/emacs/notmuch-jump.el\r
  83 @@ -25,6 +25,12 @@\r
  84  (require 'notmuch-lib)\r
  85  (require 'notmuch-hello)\r
  86  \r
  87 +(unless (fboundp 'window-body-width)\r
  88 +  ;; Compatibility for Emacs pre-24\r
  89 +  (defun window-body-width (&optional window)\r
  90 +    (let ((edges (window-inside-edges window)))\r
  91 +      (- (caddr edges) (car edges)))))\r
  92 +\r
  93  ;;;###autoload\r
  94  (defun notmuch-jump-search ()\r
  95    "Jump to a saved search by shortcut key.\r
  96 @@ -165,9 +171,3 @@ (defun notmuch-jump--make-keymap (action-map)\r
  97            (setq notmuch-jump--action ',(third action))\r
  98            (exit-minibuffer))))\r
  99      map))\r
 100 -\r
 101 -(unless (fboundp 'window-body-width)\r
 102 -  ;; Compatibility for Emacs pre-24\r
 103 -  (defun window-body-width (&optional window)\r
 104 -    (let ((edges (window-inside-edges window)))\r
 105 -      (- (caddr edges) (car edges)))))\r
 106 -- \r
 107 2.0.0\r
 108 \r