From 36806a0dd6c44f5c20b86b8a3ea9bec422750057 Mon Sep 17 00:00:00 2001
From: William Xu <william.xwl@gmail.com>
Date: Sun, 14 Oct 2007 06:39:00 +0000
Subject: Replace `nnheader-concat' with `concat + file-name-as-directory' to
 make XEmacs happy.

darcs-hash:20071014063932-cfa61-62cac9e96ea91d9205a5932a063cff5f356ddb43.gz
---
 emms-cache.el   | 2 +-
 emms-history.el | 2 +-
 emms-score.el   | 2 +-
 emms-streams.el | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emms-cache.el b/emms-cache.el
index 6ec1751..9c6ae5f 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 (nnheader-concat emms-directory "cache")
+(defcustom emms-cache-file (concat (file-name-as-directory 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 368c234..47d2e73 100644
--- a/emms-history.el
+++ b/emms-history.el
@@ -45,7 +45,7 @@ Emacs."
   :prefix "emms-history-"
   :group 'emms)
 
-(defcustom emms-history-file (nnheader-concat emms-directory "emms-history")
+(defcustom emms-history-file (concat (file-name-as-directory emms-directory) "history")
   "The file to save playlists in."
   :type   'string
   :group  'emms-history)
diff --git a/emms-score.el b/emms-score.el
index 21d5299..02e0d7e 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 (nnheader-concat emms-directory "scores")
+(defcustom emms-score-file (concat (file-name-as-directory emms-directory) "scores")
   "*Directory to store the score file."
   :type 'directory
   :group 'emms)
diff --git a/emms-streams.el b/emms-streams.el
index 8a97975..38423f6 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 (nnheader-concat emms-directory "streams")
+(defcustom emms-stream-bookmarks-file (concat (file-name-as-directory emms-directory) "streams")
   "*The file where you store your favorite emms streams."
   :type 'file
   :group 'emms-stream)
-- 
cgit v1.2.3