[PATCH] emacs: jump: fix compile warning on emacs 23

diff --git a/68/579fb70f5095fc73b97221892e4e57c67a82e5 b/68/579fb70f5095fc73b97221892e4e57c67a82e5
new file mode 100644 (file)
index 0000000..ac5d45c
--- /dev/null
+++ b/68/579fb70f5095fc73b97221892e4e57c67a82e5
@@ -0,0 +1,121 @@
+Return-Path: <markwalters1009@gmail.com>\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 1C410431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  4 Sep 2014 02:47:15 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 Fx2AR21aKl9E for <notmuch@notmuchmail.org>;\r
+       Thu,  4 Sep 2014 02:47:09 -0700 (PDT)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 68A86431FAF\r
+       for <notmuch@notmuchmail.org>; Thu,  4 Sep 2014 02:47:09 -0700 (PDT)\r
+Received: by mail-wi0-f181.google.com with SMTP id e4so732668wiv.14\r
+       for <notmuch@notmuchmail.org>; Thu, 04 Sep 2014 02:47:08 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id;\r
+       bh=o6wkQIVWoJOu5Yz85J6lk1cJ5+japQL2mX9qmM176A0=;\r
+       b=VCxSdHqmip5vdGL5G/kh9nE84a8VpaY6KEL7HPhkGWEYzb9H65f+7g6Eo7QwNUR6B3\r
+       5kN8onhEs+eiNOtorERXxHcs342udFK9PRhxswmAgfVJK7UijNRbrt0HipE9JoTskxRQ\r
+       a2bKZSD0Iv3VLw9aH0M3K20AVSdJVy9ko5cEc++wl8fEUkzPX0hG6T02ybw5C5dYJ35f\r
+       pa03O54tp6uPIMmPb4k3YZ22t6gUdb1HQagmpC7cS0AVKosaa4LK0pVhh6CCJh7c1OQF\r
+       BWRfol61lu2NoYTzi4cfP5fdhOYFhzu8VH1byGu9NILo2d/btIs7LzDejO+6b2NGnXc0\r
+       vgfA==\r
+X-Received: by 10.194.157.135 with SMTP id wm7mr4395162wjb.117.1409824027024; \r
+       Thu, 04 Sep 2014 02:47:07 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+       by mx.google.com with ESMTPSA id s1sm792000wiw.6.2014.09.04.02.47.05\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 04 Sep 2014 02:47:06 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: jump: fix compile warning on emacs 23\r
+Date: Thu,  4 Sep 2014 10:46:54 +0100\r
+Message-Id: <1409824014-14622-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\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: Thu, 04 Sep 2014 09:47:15 -0000\r
+\r
+notmuch-jump uses window-body-width which is not defined in emacs\r
+23. To get around this it does\r
+\r
+(unless (fboundp 'window-body-width)\r
+  ;; Compatibility for Emacs pre-24\r
+  (defalias 'window-body-width 'window-width))\r
+\r
+This makes sure window-body-width is defined and all should be\r
+well. But it seems that the byte compiler does not realise that this\r
+guarantees that window-body-width will be defined and so, when\r
+compiling with emacs 23, it gives an error\r
+\r
+In end of data:\r
+notmuch-jump.el:172:1:Warning: the function `window-body-width' is not known to be defined.\r
+\r
+Domo and I came to following on irc: wrap the (unless (fboundp ...))\r
+inside eval-and-compile which ensures that both the test and the\r
+defalias (if needed) happen at both compile and load time.  This fixes\r
+the warning.\r
+---\r
+I think Domo and I were both not completely sure whether the\r
+eval-and-compile should be inside or outside the (unless fboundp ..)\r
+or not (ie should it wrap the unless fboundp or just the defalias) nor\r
+whether it should be eval-and-compile or eval-when-compile.\r
+\r
+We think this is the right version but it would be good to have confirmation.\r
+\r
+I tested notmuch jump inside emacs 23 and 24 with notmuch-emacs\r
+compiled with emacs 23 or 24 (ie all four combinations) and it seemed to work.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+ emacs/notmuch-jump.el |    7 ++++---\r
+ 1 file changed, 4 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el\r
+index 5eb0949..2706b6c 100644\r
+--- a/emacs/notmuch-jump.el\r
++++ b/emacs/notmuch-jump.el\r
+@@ -25,9 +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
++(eval-and-compile\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
+-- \r
+1.7.10.4\r
+\r