From 13ce41a3e3fb3e080563402f123e5e784c4baffe Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar.batsov@gmail.com>
Date: Tue, 11 Oct 2011 21:24:22 +0300
Subject: [PATCH] leftover from the previous commit

---
 init.el                   | 8 ++++----
 modules/prelude-core.el   | 2 +-
 modules/prelude-editor.el | 2 +-
 modules/prelude-ui.el     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/init.el b/init.el
index 2c96550..167fa25 100644
--- a/init.el
+++ b/init.el
@@ -38,13 +38,13 @@
 (if (string= system-type "darwin")
     (push "/usr/local/bin" exec-path))
 
-(defvar prelude-modules-dir (concat emacs-user-dir "modules/")
+(defvar prelude-modules-dir (concat user-emacs-directory "modules/")
   "This directory houses all of the built-in Prelude module. You should
 avoid modifying the configuration there.")
-(defvar prelude-vendor-dir (concat emacs-user-dir "vendor/")
+(defvar prelude-vendor-dir (concat user-emacs-directory "vendor/")
   "This directory house Emacs Lisp packages that are not yet available in
 ELPA (or Marmalade).")
-(defvar prelude-personal-dir (concat emacs-user-dir "personal/")
+(defvar prelude-personal-dir (concat user-emacs-directory "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.")
@@ -78,7 +78,7 @@ by Prelude.")
 (when (file-exists-p prelude-personal-dir)
   (mapc 'load (directory-files prelude-personal-dir nil "^[^#].*el$")))
 ;; config changes made through the customize UI will be store here
-(setq custom-file (concat prelude-dir "custom.el"))
+(setq custom-file (concat prelude-personal-dir "custom.el"))
 (load custom-file 'noerror)
 
 ;;; init.el ends here
diff --git a/modules/prelude-core.el b/modules/prelude-core.el
index 448813e..7352148 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 emacs-user-dir 0)
+  (byte-recompile-directory user-emacs-directory 0)
   (byte-recompile-directory prelude-vendor-dir 0))
 
 (defun prelude-regen-autoloads (&optional force-regen)
diff --git a/modules/prelude-editor.el b/modules/prelude-editor.el
index 603a38e..45f1c60 100644
--- a/modules/prelude-editor.el
+++ b/modules/prelude-editor.el
@@ -93,7 +93,7 @@
 (savehist-mode t)                      ;; do customization before activation
 
 ;; save recent files
-(setq recentf-save-file (concat prelude-dir "recentf") ;; keep ~/ clean
+(setq recentf-save-file (concat user-emacs-directory "recentf") ;; keep ~/ clean
       recentf-max-saved-items 100          ;; max save 100
       recentf-max-menu-items 15)         ;; max 15 in menu
 (recentf-mode t)                  ;; turn it on
diff --git a/modules/prelude-ui.el b/modules/prelude-ui.el
index c59438a..03423e1 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 prelude-dir "themes/"))
+(add-to-list 'custom-theme-load-path (concat user-emacs-directory "themes/"))
 (load-theme 'zenburn t)
 
 (provide 'prelude-ui)