From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mEH1Eou2HV/JDAAA0tVLHw (envelope-from ) for ; Sun, 26 Jul 2020 16:59:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8GejDou2HV9FWwAAbx9fmQ (envelope-from ) for ; Sun, 26 Jul 2020 16:59:55 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0B4269404E1 for ; Sun, 26 Jul 2020 16:59:55 +0000 (UTC) Received: from [144.217.243.247] (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 592FA27DEF; Sun, 26 Jul 2020 12:59:04 -0400 (EDT) Received: from mail.hostpark.net (mail.hostpark.net [212.243.197.30]) by mail.notmuchmail.org (Postfix) with ESMTPS id B724E200A5 for ; Sun, 26 Jul 2020 12:58:24 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id E8A7E1610F for ; Sun, 26 Jul 2020 18:58:19 +0200 (CEST) X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail1.hostpark.net [127.0.0.1]) (amavisd-new, port 10124) with ESMTP id jWDluQxIbc5J for ; Sun, 26 Jul 2020 18:58:19 +0200 (CEST) Received: from customer (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.hostpark.net (Postfix) with ESMTPSA id C242F16155 for ; Sun, 26 Jul 2020 18:58:19 +0200 (CEST) From: Jonas Bernoulli To: notmuch@notmuchmail.org Subject: [PATCH 17/23] emacs: Autoload notmuch-jump-search only once Date: Sun, 26 Jul 2020 18:58:12 +0200 Message-Id: <20200726165818.400-18-jonas@bernoul.li> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200726165818.400-1-jonas@bernoul.li> References: <20200726165818.400-1-jonas@bernoul.li> MIME-Version: 1.0 Message-ID-Hash: EPQSOLFNT56ZBGJCMGHXTILKZPDBMAWM X-Message-ID-Hash: EPQSOLFNT56ZBGJCMGHXTILKZPDBMAWM X-MailFrom: jonas@bernoul.li X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 0.03 X-TUID: wX4VRlUPwhtb 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 069a19e9..549161f3 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -35,9 +35,6 @@ (unless (require 'notmuch-version nil t) (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-query) (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)) -- 2.26.0