From a6fe65ef66255a80dbefd60c10225abe281c1dbd Mon Sep 17 00:00:00 2001
From: William Xu <william.xwl@gmail.com>
Date: Fri, 12 Oct 2007 02:45:00 +0000
Subject: Move emms config files to a common directory: ~/.emacs.d/emms.

darcs-hash:20071012024503-cfa61-0e061f1f19c1ca449aa5ac6814ba2d720f14ed9e.gz
---
 emms-cache.el   | 2 +-
 emms-history.el | 2 +-
 emms-score.el   | 2 +-
 emms-streams.el | 2 +-
 emms.el         | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/emms-cache.el b/emms-cache.el
index fb3444c..6ec1751 100644
--- a/emms-cache.el
+++ b/emms-cache.el
@@ -56,7 +56,7 @@ This is used to cache over emacs sessions.")
 (defvar emms-cache-dirty nil
   "True if the cache has been updated since init.")
 
-(defcustom emms-cache-file "~/.emms-cache"
+(defcustom emms-cache-file (nnheader-concat emms-directory "cache")
   "A file used to store cached file information over sessions."
   :group 'emms
   :type 'file)
diff --git a/emms-history.el b/emms-history.el
index 558d496..368c234 100644
--- a/emms-history.el
+++ b/emms-history.el
@@ -45,7 +45,7 @@ Emacs."
   :prefix "emms-history-"
   :group 'emms)
 
-(defcustom emms-history-file "~/.emacs.d/emms-history"
+(defcustom emms-history-file (nnheader-concat emms-directory "emms-history")
   "The file to save playlists in."
   :type   'string
   :group  'emms-history)
diff --git a/emms-score.el b/emms-score.el
index de9346d..21d5299 100644
--- a/emms-score.el
+++ b/emms-score.el
@@ -70,7 +70,7 @@
 (defvar emms-score-enabled-p nil
   "If non-nil, emms score is active.")
 
-(defcustom emms-score-file "~/.emacs.d/emms-scores"
+(defcustom emms-score-file (nnheader-concat emms-directory "scores")
   "*Directory to store the score file."
   :type 'directory
   :group 'emms)
diff --git a/emms-streams.el b/emms-streams.el
index d109547..8a97975 100644
--- a/emms-streams.el
+++ b/emms-streams.el
@@ -39,7 +39,7 @@
   "*Add and play streams with EMMS."
   :group 'emms)
 
-(defcustom emms-stream-bookmarks-file "~/.emacs.d/emms-streams"
+(defcustom emms-stream-bookmarks-file (nnheader-concat emms-directory "streams")
   "*The file where you store your favorite emms streams."
   :type 'file
   :group 'emms-stream)
diff --git a/emms.el b/emms.el
index d25808d..ca618b0 100644
--- a/emms.el
+++ b/emms.el
@@ -256,6 +256,11 @@ The modified track is passed as the argument to this function."
   :group 'emms
   :type 'function)
 
+(defcustom emms-directory "~/.emacs.d/emms"
+  "*Directory variable from which all other emms file variables are derived."
+  :group 'emms
+  :type 'string)
+
 (defvar emms-player-playing-p nil
   "The currently playing EMMS player, or nil.")
 
-- 
cgit v1.2.3