From: Austin Clements <amdragon@MIT.EDU>
Date: Fri, 8 Aug 2014 17:06:05 +0000 (-0400)
Subject: emacs: Improved compatibility for window-body-width in Emacs < 24
X-Git-Tag: address-command-v2~104
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/notmuch.git/commitdiff_plain/c1845bf0a430b1d0bda6703246a1bcc8962175ab

emacs: Improved compatibility for window-body-width in Emacs < 24

Fix byte compiler warning "Warning: the function `window-body-width'
is not known to be defined." by moving our compatibility wrapper
before its use and simplify the definition to a defalias for the old
name of the function.
---

diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index 05bbce5e..5eb0949b 100644
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -25,6 +25,10 @@
 (require 'notmuch-lib)
 (require 'notmuch-hello)
 
+(unless (fboundp 'window-body-width)
+  ;; Compatibility for Emacs pre-24
+  (defalias 'window-body-width 'window-width))
+
 ;;;###autoload
 (defun notmuch-jump-search ()
   "Jump to a saved search by shortcut key.
@@ -165,9 +169,3 @@ buffer."
 	   (setq notmuch-jump--action ',(third action))
 	   (exit-minibuffer))))
     map))
-
-(unless (fboundp 'window-body-width)
-  ;; Compatibility for Emacs pre-24
-  (defun window-body-width (&optional window)
-    (let ((edges (window-inside-edges window)))
-      (- (caddr edges) (car edges)))))