From: Sean Whitton <spwhitton@spwhitton.name>
Date: Mon, 1 Jun 2020 06:17:04 +0000 (-0700)
Subject: emacs: Respect `load-prefer-newer` when loading `notmuch-init-file'
X-Git-Tag: archive/debian/0.30_rc0-1~8
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=3e6e219384b75fbb0f067c59a0ae279bab5be7ff;ds=sidebyside

emacs: Respect `load-prefer-newer` when loading `notmuch-init-file'

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.
---

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