From 29ca3b99c4e6e8c5b91efdc1a68c3dcb423e05f8 Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Tue, 11 Oct 2011 22:21:31 +0300 Subject: [PATCH] made prelude-dir relative to the location of Prelude's init.el --- init.el | 8 +++++--- modules/prelude-core.el | 2 +- modules/prelude-ui.el | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/init.el b/init.el index 167fa25..d6625fb 100644 --- a/init.el +++ b/init.el @@ -38,13 +38,15 @@ (if (string= system-type "darwin") (push "/usr/local/bin" exec-path)) -(defvar prelude-modules-dir (concat user-emacs-directory "modules/") +(defvar prelude-dir (file-name-directory load-file-name) + "The root dir of the Emacs Prelude distribution.") +(defvar prelude-modules-dir (concat prelude-dir "modules/") "This directory houses all of the built-in Prelude module. You should avoid modifying the configuration there.") -(defvar prelude-vendor-dir (concat user-emacs-directory "vendor/") +(defvar prelude-vendor-dir (concat prelude-dir "vendor/") "This directory house Emacs Lisp packages that are not yet available in ELPA (or Marmalade).") -(defvar prelude-personal-dir (concat user-emacs-directory "personal/") +(defvar prelude-personal-dir (concat prelude-dir "personal/") "Users of Emacs Prelude are encouraged to keep their personal configuration changes in this directory. All Emacs Lisp files there are loaded automatically by Prelude.") diff --git a/modules/prelude-core.el b/modules/prelude-core.el index 7352148..d628769 100644 --- a/modules/prelude-core.el +++ b/modules/prelude-core.el @@ -348,7 +348,7 @@ there's a region, all lines that region covers will be duplicated." (defun prelude-recompile-init () "Byte-compile all your dotfiles again." (interactive) - (byte-recompile-directory user-emacs-directory 0) + (byte-recompile-directory prelude-dir 0) (byte-recompile-directory prelude-vendor-dir 0)) (defun prelude-regen-autoloads (&optional force-regen) diff --git a/modules/prelude-ui.el b/modules/prelude-ui.el index 03423e1..c59438a 100644 --- a/modules/prelude-ui.el +++ b/modules/prelude-ui.el @@ -59,7 +59,7 @@ (fset 'yes-or-no-p 'y-or-n-p) ;; custom Emacs 24 color themes support -(add-to-list 'custom-theme-load-path (concat user-emacs-directory "themes/")) +(add-to-list 'custom-theme-load-path (concat prelude-dir "themes/")) (load-theme 'zenburn t) (provide 'prelude-ui)