From c1845bf0a430b1d0bda6703246a1bcc8962175ab Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 8 Aug 2014 13:06:05 -0400 Subject: [PATCH] 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. --- emacs/notmuch-jump.el | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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))))) -- 2.26.2