From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oOe0E3251F7wEwAA0tVLHw (envelope-from ) for ; Mon, 01 Jun 2020 08:17:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id KBtOD3251F4dawAAB5/wlQ (envelope-from ) for ; Mon, 01 Jun 2020 08:17:01 +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 D90359407C8 for ; Mon, 1 Jun 2020 08:16:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 807AB6DE0F54; Mon, 1 Jun 2020 01:16:54 -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 RKaGTZWQcmrl; Mon, 1 Jun 2020 01:16:53 -0700 (PDT) Received: from arlo.cworth.org (localhost [IPv6:::1]) by arlo.cworth.org (Postfix) with ESMTP id 49EDB6DE0EA6; Mon, 1 Jun 2020 01:16:53 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 8B9556DE0EA6 for ; Mon, 1 Jun 2020 01:16:51 -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 bS6BG-M3GpSk for ; Mon, 1 Jun 2020 01:16:50 -0700 (PDT) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by arlo.cworth.org (Postfix) with ESMTPS id CB3B26DE0BEF for ; Mon, 1 Jun 2020 01:16:49 -0700 (PDT) Received: by mail-wm1-f67.google.com with SMTP id c71so9788506wmd.5 for ; Mon, 01 Jun 2020 01:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dme-org.20150623.gappssmtp.com; s=20150623; h=to:subject:in-reply-to:references:from:date:message-id:mime-version; bh=wcpkHDdrun+G0Yc/pBfpjz8+gVL3DNAQDIuFvvu1+P8=; b=TE/Tcmyz/OK2UeXV7Ap11j3jbjAB9i0I28VSRb2jg21+i81pyckKIipLhtFMaV7F1j I9uJbvSIiS2Ng7MTzVcUxs4yvYbUxZbvQAFPLj7PZufWcxO059WbVNlQzTTHgULXP72b UlztIUqY9nttP3hfgbmsMWExNySgvsOGQn0BIUuAbRzQVhT6XFWux9Z11+90lS5dgr5E JTne5ZRiX9UrPK2OLVCbi9JZHmGumygnNE4pNddakHIdKl7Ka9y6iP1DExJffIm2Tqn8 7ylnTL8WoHEiyeSPgk9VHemGshWrDCB8dPUSB4IY2KSJwFlv8oR+Y1KXsHLV8S3KCkM/ 418g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:subject:in-reply-to:references:from:date :message-id:mime-version; bh=wcpkHDdrun+G0Yc/pBfpjz8+gVL3DNAQDIuFvvu1+P8=; b=qp8tND0i/cIUvL6lS34w5ibFgy62J1KblCiRzKwZyqNDKCkF1h0LbtHdZAW/WbGQdP YeU4KiLwJJUcbEQGeHaN90bdXU1qg5nPYAWBiIMyJ8qYdwp3DI5yxAUoxLhXEqkIzfRF MmRY9brDuvZQZG9TIovt46Wluf9kMNZfGCaBJISLXm7XsBFsa6PiKMK34+5lOBXaBGb5 p5l1n0zoeA9LdfldzZHTq4wCZPacM3ZqpAWBY8r8tBZndDDJAIvoxz5C39QNySmQAL3J o0w4ZrQWV3mIdc6xYKuwVLy3xkdoPgJveXnDuuMsURikn+C94CLrMvVZBcVnK74CpvD3 9i0A== X-Gm-Message-State: AOAM530uxNkmQmN0gE4HwqEqeDs1hkHoyINqLVzyf0tI93S8w5zh3hlZ 3h934PijiZcbh1QFtaJmcGJUiA== X-Google-Smtp-Source: ABdhPJw7sm9EDJ188uxR0mNx+L0gjzZlZ8SNJFncc9uaTuoPWB0itGUIZQbvZvCesD05eOvzI5t+Tg== X-Received: by 2002:a1c:9c85:: with SMTP id f127mr21079339wme.79.1590999408115; Mon, 01 Jun 2020 01:16:48 -0700 (PDT) Received: from disaster-area.hh.sledj.net (disaster-area.hh.sledj.net. [2001:8b0:bb71:7140:64::1]) by smtp.gmail.com with ESMTPSA id n23sm11133301wmc.21.2020.06.01.01.16.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2020 01:16:47 -0700 (PDT) Received: from localhost (disaster-area.hh.sledj.net [local]) by disaster-area.hh.sledj.net (OpenSMTPD) with ESMTPA id 705e0d49; Mon, 1 Jun 2020 08:16:46 +0000 (UTC) To: Sean Whitton , notmuch@notmuchmail.org Subject: Re: [PATCH] emacs: Respect `load-prefer-newer` when loading `notmuch-init-file' In-Reply-To: <20200601061704.24071-1-spwhitton@spwhitton.name> References: <20200601061704.24071-1-spwhitton@spwhitton.name> X-HGTTG: heart-of-gold From: David Edmondson Date: Mon, 01 Jun 2020 09:16:46 +0100 Message-ID: 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=dme-org.20150623.gappssmtp.com header.s=20150623 header.b=TE/Tcmyz; 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.01 X-TUID: jmSABg1+N3tV On Sunday, 2020-05-31 at 23:17:04 -07, Sean Whitton wrote: > 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. Reviewed-by: David Edmondson > --- > 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 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > https://notmuchmail.org/mailman/listinfo/notmuch dme. -- I went starin' out of my window, been caught doin' it once or twice.