From 3e6e219384b75fbb0f067c59a0ae279bab5be7ff Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 31 May 2020 23:17:04 -0700 Subject: [PATCH] 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. --- 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