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

diff --git a/08/eec2dd0f02c598670a35868015e3175ddf7b62 b/08/eec2dd0f02c598670a35868015e3175ddf7b62
new file mode 100644 (file)
index 0000000..29950c5
--- /dev/null
+++ b/08/eec2dd0f02c598670a35868015e3175ddf7b62
@@ -0,0 +1,105 @@
+Return-Path: <tomi.ollila@iki.fi>\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 38E0B431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Aug 2014 03:11:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 SPDaDnsB7m4i for <notmuch@notmuchmail.org>;\r
+       Sat,  9 Aug 2014 03:11:17 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id A0284431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Aug 2014 03:11:17 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 8C32D100051;\r
+       Sat,  9 Aug 2014 13:11:03 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v2] emacs: Improved compatibility for window-body-width\r
+       in      Emacs < 24\r
+In-Reply-To: <1407517565-24490-1-git-send-email-amdragon@mit.edu>\r
+References: <1407510680-17576-1-git-send-email-amdragon@mit.edu>\r
+       <1407517565-24490-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.18.1+25~gdaf4b6f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sat, 09 Aug 2014 13:11:03 +0300\r
+Message-ID: <m2k36ic6rs.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sat, 09 Aug 2014 10:11:23 -0000\r
+\r
+On Fri, Aug 08 2014, Austin Clements <amdragon@MIT.EDU> wrote:\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
+LGTM. Tested w/ (notmuch-jump nil "foo") in emacs 23.1.1 -- call failed\r
+but after calling (window-body-width).\r
+\r
+Tomi\r
+\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r