[PATCH v2] emacs: Improved compatibility for window-body-width in Emacs < 24

diff --git a/32/275289b01ec2d84ffd17774ea3b9cad066cfb8 b/32/275289b01ec2d84ffd17774ea3b9cad066cfb8
new file mode 100644 (file)
index 0000000..c88c1c7
--- /dev/null
+++ b/32/275289b01ec2d84ffd17774ea3b9cad066cfb8
@@ -0,0 +1,116 @@
+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 3BFBE431FAF\r
+       for <notmuch@notmuchmail.org>; Fri,  8 Aug 2014 10:06:21 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[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 5Sq+Mqm4ZudP for <notmuch@notmuchmail.org>;\r
+       Fri,  8 Aug 2014 10:06:15 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
+       [18.7.68.35])\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 E43C5431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  8 Aug 2014 10:06:14 -0700 (PDT)\r
+X-AuditID: 12074423-f79bf6d000007580-39-53e5038520de\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 38.72.30080.58305E35; Fri,  8 Aug 2014 13:06:13 -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 s78H69ps025799; \r
+       Fri, 8 Aug 2014 13:06:10 -0400\r
+Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])\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 s78H67Ld014615\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 8 Aug 2014 13:06:09 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XFncF-0006Ot-26; Fri, 08 Aug 2014 13:06:07 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: Improved compatibility for window-body-width in\r
+       Emacs < 24\r
+Date: Fri,  8 Aug 2014 13:06:05 -0400\r
+Message-Id: <1407517565-24490-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1407510680-17576-1-git-send-email-amdragon@mit.edu>\r
+References: <1407510680-17576-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrJIsWRmVeSWpSXmKPExsUixCmqrNvK/DTYYMd7Xoum6c4W12/OZHZg\r
+       8rh1/zW7x7NVt5gDmKK4bFJSczLLUov07RK4Mtaducxa0MdVcWF9SQPjIo4uRk4OCQETiS/P\r
+       dzFD2GISF+6tZ+ti5OIQEpjNJHF52ysoZwOjxJSWHkaQKiGBw0wS/ydXQCTmMko8XHOLBSTB\r
+       JqAhsW3/crAiEQFpiZ13Z7N2MXJwMAuYS9xsiQMJCwuESmxpbgErYRFQlbh2uJUdpIRXwEHi\r
+       1tNAiCPkJBpufGIDsTkFHCVaD11hgljrILFo/0/WCYz8CxgZVjHKpuRW6eYmZuYUpybrFicn\r
+       5uWlFuma6eVmluilppRuYgSFELuL8g7GPweVDjEKcDAq8fAKdD8OFmJNLCuuzD3EKMnBpCTK\r
+       O+vVk2AhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrxPHgHleFMSK6tSi/JhUtIcLErivG+trYKF\r
+       BNITS1KzU1MLUotgsjIcHEoSvH+ZngYLCRalpqdWpGXmlCCkmTg4QYbzAA1/BVLDW1yQmFuc\r
+       mQ6RP8WoKCXOGwqSEABJZJTmwfXCYvwVozjQK8K8nMCIF+IBpge47ldAg5mABsuqPgYZXJKI\r
+       kJJqYLz5sDeanUtIQCOuYK5kn4T9FJfZlyySvpZmGQcoypQ8sz9UfqxPvvrB9RfdvpsMM/0v\r
+       nWx8+urDga/a6vbzD9ZEGJnuPsGzc2/aWfM9fuUnVeKLrj7ZvroyelHVl9V+h9qW7j3UV6Ms\r
+       VLrhtpj7JYaEOb01f2t1Y9v2lm0qerf6KEvauziuF0osxRmJhlrMRcWJACqSVG3MAgAA\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: Fri, 08 Aug 2014 17:06:21 -0000\r
+\r
+Fix byte compiler warning "Warning: the function `window-body-width'\r
+is not known to be defined." by moving our compatibility wrapper\r
+before its use and simplify the definition to a defalias for the old\r
+name of the function.\r
+---\r
+\r
+Tomi pointed out that window-body-width simply used to be called\r
+window-width, so this simplifies the wrapper to a defalias.\r
+\r
+ emacs/notmuch-jump.el | 10 ++++------\r
+ 1 file changed, 4 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el\r
+index 05bbce5..5eb0949 100644\r
+--- a/emacs/notmuch-jump.el\r
++++ b/emacs/notmuch-jump.el\r
+@@ -25,6 +25,10 @@\r
+ (require 'notmuch-lib)\r
+ (require 'notmuch-hello)\r
+ \r
++(unless (fboundp 'window-body-width)\r
++  ;; Compatibility for Emacs pre-24\r
++  (defalias 'window-body-width 'window-width))\r
++\r
+ ;;;###autoload\r
+ (defun notmuch-jump-search ()\r
+   "Jump to a saved search by shortcut key.\r
+@@ -165,9 +169,3 @@ (defun notmuch-jump--make-keymap (action-map)\r
+          (setq notmuch-jump--action ',(third action))\r
+          (exit-minibuffer))))\r
+     map))\r
+-\r
+-(unless (fboundp 'window-body-width)\r
+-  ;; Compatibility for Emacs pre-24\r
+-  (defun window-body-width (&optional window)\r
+-    (let ((edges (window-inside-edges window)))\r
+-      (- (caddr edges) (car edges)))))\r
+-- \r
+2.0.0\r
+\r