From c2e9ec17fd46e67c7cf1f06d4c6da2ed59da34d9 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sat, 8 Aug 2020 13:49:51 +0200 Subject: [PATCH] emacs: Autoload notmuch-jump-search only once This function is being autoloaded using an autoload cookie, so it shouldn't additionally be autoloaded using an `autoload' form. When building libraries we don't actually load the autoloads file and dropping the `autoload' form results in an error, which reveals a so far unspecified dependency: `notmuch-tree' needs `notmuch-jump'. Before this commit compiling (or even just loading) `notmuch-tree' resulted in `notmuch-jump' being loaded because the former requires `notmuch-lib', which autoloaded `notmuch-jump-search'. The bug was that this dependency was not explicitly specified, which we fix by adding the respective `require' form. --- emacs/notmuch-lib.el | 3 --- emacs/notmuch-tree.el | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index 6ff351d7..b86c44ed 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -35,9 +35,6 @@ (defconst notmuch-emacs-version "unknown" "Placeholder variable when notmuch-version.el[c] is not available.")) -(autoload 'notmuch-jump-search "notmuch-jump" - "Jump to a saved search by shortcut key." t) - (defgroup notmuch nil "Notmuch mail reader for Emacs." :group 'mail) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index 364da240..b538cef9 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -33,6 +33,7 @@ (require 'notmuch-show) (require 'notmuch-tag) (require 'notmuch-parser) +(require 'notmuch-jump) (declare-function notmuch-search "notmuch" (&optional query oldest-first target-thread target-line))