From 1727734002fba401ff099c8470dded0631924355 Mon Sep 17 00:00:00 2001 From: fap <459631+fapdash@users.noreply.github.com> Date: Sun, 16 Oct 2022 04:35:41 +0200 Subject: [PATCH] Search sample/prelude-modules.el in prelude-dir during init If the user installed prelude to different directory via the `PRELUDE_INSTALL_DIR` variable then the sample file won't be found in the `user-emacs-directory`. --- CHANGELOG.md | 1 + init.el | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3df4aa..3815ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ * [#1335](https://github.com/bbatsov/prelude/issues/1335): Workaround for `which-key` bug causing display issues in clients to `emacs --daemon`. * Fix **Edit on GitHub** link in ReadTheDocs site. +* Fix fall back to sample `prelude-modules.el` not working if user has installed to non-default location. ## 1.1.0 (2021-02-14) diff --git a/init.el b/init.el index 3f117fc..955c9f3 100644 --- a/init.el +++ b/init.el @@ -138,7 +138,7 @@ by Prelude.") (message "[Prelude] Missing personal modules file %s" prelude-modules-file) (message "[Prelude] Falling back to the bundled example file sample/prelude-modules.el") (message "[Prelude] You should copy this file to your personal configuration folder and tweak it to your liking") - (load (expand-file-name "sample/prelude-modules.el" user-emacs-directory))) + (load (expand-file-name "sample/prelude-modules.el" prelude-dir))) ;; config changes made through the customize UI will be stored here (setq custom-file (expand-file-name "custom.el" prelude-personal-dir))