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 wKKMBnid1F5ONAAA0tVLHw (envelope-from ) for ; Mon, 01 Jun 2020 06:17:28 +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 yNAtAnid1F6xTgAAbx9fmQ (envelope-from ) for ; Mon, 01 Jun 2020 06:17:28 +0000 Received: from arlo.cworth.org (arlo.cworth.org [50.126.95.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8E46C940981 for ; Mon, 1 Jun 2020 06:17:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id B5C056DE0F4A; Sun, 31 May 2020 23:17:21 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mezNKHO-LQ7q; Sun, 31 May 2020 23:17:21 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id 8E1966DE0F22; Sun, 31 May 2020 23:17:20 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id CB4CE6DE0F22 for ; Sun, 31 May 2020 23:17:17 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n8DI5CU4o5qA for ; Sun, 31 May 2020 23:17:16 -0700 (PDT) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by arlo.cworth.org (Postfix) with ESMTPS id 9E0896DE0286 for ; Sun, 31 May 2020 23:17:15 -0700 (PDT) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id E754EC76; Mon, 1 Jun 2020 02:17:12 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 01 Jun 2020 02:17:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spwhitton.name; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm3; bh=t+srwauvM060Czn02VC8iVHPON RfnXhlxCMTlv+5NkI=; b=f5qpFo4p3R5Ll2PpbZx7MZeY7leEsEHRVbCpuz9HMN hWdKcPud9SNIHMriTbrzgt+YquKdO1v/0vrRDiFjXu9m0i4/y5AZOljpVuSvSP7I +jfaEOPzvYZ8VAkfJdlXgxnz0IH1OriTz4nK1tCWQCWuWrLz7lTE/+HIWA6JxAY2 yyHHHdFQXAaj3+MlB2hNP5odmWjcDKfhre2Y8hywBMKlgcTGD5La4ynco4eA5OWL gJK8Urzn9YzEwZNxx75i0tNT/UmC2SJWRbs5WCGngwvDmsQCyYL96ilhf5A5dxkb RPK502bP587oTJ/9KcvbrP014lgr5ZlZfdza4ErI4hgA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=t+srwauvM060Czn02 VC8iVHPONRfnXhlxCMTlv+5NkI=; b=O6+/sedNAdwfSZZofukC/vJd18RcjjEU+ PulKDjZikTPB/HqPIy/ZWsKmhtWzkC74feHTK+ToyKXXKLaegrwKxA7APHcgpxY2 gFQwuV+NY8W+BFt7IizGO9GhD1UR35W95+JXJ597WVML8z4dV93giLKnAYH+d3nM hmNMq1/kwDxlUgIk4YyNygTVY+WZBhzg+W6r2J7A8mXNkpkQSxsEyqWgYrkx64qz xtfv45Mf6gjWzc8dSAixIP4POkMuN9v8i/5x51SqGBK9pmOZGh2sO73nZ5k2xJJL ucJkNhFCu357XjXkTFr/eMq/+sbcsSjkLG2nEQw8ADB9vGpTK4T5g== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrudefgedgleelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkggfgsedtkeertddttd dtnecuhfhrohhmpefuvggrnhcuhghhihhtthhonhcuoehsphifhhhithhtohhnsehsphif hhhithhtohhnrdhnrghmvgeqnecuggftrfgrthhtvghrnhepgedtueeufeeludehtddvhe egvedutdefhfehffetveegjeeitdeghfejgedtteeunecuvehluhhsthgvrhfuihiivgep tdenucfrrghrrghmpehmrghilhhfrhhomhepshhpfihhihhtthhonhesshhpfihhihhtth honhdrnhgrmhgv X-ME-Proxy: From: Sean Whitton To: notmuch@notmuchmail.org Subject: [PATCH] emacs: Respect `load-prefer-newer` when loading `notmuch-init-file' Date: Sun, 31 May 2020 23:17:04 -0700 Message-Id: <20200601061704.24071-1-spwhitton@spwhitton.name> MIME-Version: 1.0 X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: notmuch-bounces@notmuchmail.org Sender: "notmuch" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=spwhitton.name header.s=fm3 header.b=f5qpFo4p; dkim=fail (body hash did not verify) header.d=messagingengine.com header.s=fm2 header.b=O6+/sedN; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 50.126.95.6 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 0.99 X-TUID: u6g8E4IFiwYt Before this change, `load-prefer-newer' was ignored. Set NOERROR and MUST-SUFFIX arguments of `load' to t, and NOSUFFIX argument to nil, to preserve the behaviour of the deleted `let' form. --- I've observed that the way that the code at the end of notmuch.el loads the user's notmuch-init-file means that the variable load-prefer-newer is effectively ignored: notmuch.el will always load notmuch-config.elc in preference to notmuch-config.el, even if the latter is newer than the former. This patch should fix the problem without changing anything else. emacs/notmuch.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/emacs/notmuch.el b/emacs/notmuch.el index a980c7a2..5a24d8a7 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -1148,8 +1148,6 @@ beginning of the line." ;; After provide to avoid loops if notmuch was require'd via notmuch-init-file. (if init-file-user ; don't load init file if the -q option was used. - (let ((init-file (locate-file notmuch-init-file '("/") - (get-load-suffixes)))) - (if init-file (load init-file nil t t)))) + (load notmuch-init-file t t nil t)) ;;; notmuch.el ends here -- 2.26.2