diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-05-31 23:17:04 -0700 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2020-06-01 07:52:28 -0300 |
| commit | 3e6e219384b75fbb0f067c59a0ae279bab5be7ff (patch) | |
| tree | c425f1b66e1f786b108207222787b86da2fc96e2 | |
| parent | b624b406ff004909e30903593e6b4f7dd889c9dc (diff) | |
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.
| -rw-r--r-- | emacs/notmuch.el | 4 |
1 files changed, 1 insertions, 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 |
