X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=emacs%2Fnotmuch-jump.el;h=05ec57ec5e13aeb2071f5a2a9282ad63bb3af793;hp=05bbce5eaeadb8d8866749059c90b13b9d76e867;hb=4e2c351c588ad74f4800ca0344232be90387c54a;hpb=f92342cb76fa3e1fa2f1c2e727f8ddf1a5c21b7d

diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index 05bbce5e..05ec57ec 100644
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -25,6 +25,11 @@
 (require 'notmuch-lib)
 (require 'notmuch-hello)
 
+(eval-and-compile
+  (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.
@@ -47,7 +52,7 @@ fast way to jump to a saved search from anywhere in Notmuch."
 		 (case (plist-get saved-search :sort-order)
 		   (newest-first nil)
 		   (oldest-first t)
-		   (otherwise (default-value notmuch-search-oldest-first)))))
+		   (otherwise (default-value 'notmuch-search-oldest-first)))))
 	    (push (list key name
 			`(lambda () (notmuch-search ',query ',oldest-first)))
 		  action-map)))))
@@ -165,9 +170,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)))))