[emms-help] A couple of bug fixes

[Daniel Brockman]

Just some minor fixes.

Index: emms-default.el
===================================================================
RCS file: /cvsroot/emms/emms/emms-default.el,v
retrieving revision 1.8
diff -u -r1.8 emms-default.el
--- emms-default.el     8 May 2004 12:40:24 -0000       1.8
+++ emms-default.el     25 Apr 2005 13:31:48 -0000
@@ -26,6 +26,9 @@
 
 ;;; Code:
 
+(eval-when-compile
+  (require 'cl))
+
 (defun emms-setup (level &optional directory &rest directories)
   "Sets up EMMS to a specific LEVEL of bells and whistles.
 
Index: emms-source-file.el
===================================================================
RCS file: /cvsroot/emms/emms/emms-source-file.el,v
retrieving revision 1.25
diff -u -r1.25 emms-source-file.el
--- emms-source-file.el 2 Dec 2004 16:38:25 -0000       1.25
+++ emms-source-file.el 25 Apr 2005 13:31:48 -0000
@@ -53,7 +53,8 @@
   :type 'string
   :group 'emms-source-file)
 
-(defcustom emms-source-file-directory-tree-function 
'emms-source-file-directory-tree-internal
+(defcustom emms-source-file-directory-tree-function
+  'emms-source-file-directory-tree-internal
   "*A function to call that searches in a given directory all files
 that match a given regex. DIR and REGEX are the only arguments passed
 to this function.
@@ -93,10 +94,10 @@
   "An EMMS source for a whole directory tree - either DIR, or queried
 from the user"
   (interactive (list
-                (read-file-name "Play directory: "
-                                emms-source-file-default-directory
-                                emms-source-file-default-directory
-                                t)))
+                (read-directory-name "Play directory: "
+                                     emms-source-file-default-directory
+                                     emms-source-file-default-directory
+                                     t)))
   (mapcar (lambda (file)
             (emms-track 'file (expand-file-name file)))
           (directory-files dir t (emms-source-file-regex))))
@@ -107,10 +108,10 @@
   "An EMMS source for multiple directory trees - either DIR, or the
 value of `emms-source-file-default-directory'."
   (interactive (list
-                (read-file-name "Play directory tree: "
-                                emms-source-file-default-directory
-                                emms-source-file-default-directory
-                                t)))
+                (read-directory-name "Play directory tree: "
+                                     emms-source-file-default-directory
+                                     emms-source-file-default-directory
+                                     t)))
   (mapcar (lambda (file)
             (emms-track 'file file))
           (emms-source-file-directory-tree (expand-file-name dir)
@@ -123,10 +124,10 @@
   "An EMMS source that will find files in DIR or
 `emms-source-file-default-directory' that match REGEXP."
   (interactive (list
-                (read-file-name "Find in directory: "
-                                emms-source-file-default-directory
-                                emms-source-file-default-directory
-                                t)
+                (read-directory-name "Find in directory: "
+                                     emms-source-file-default-directory
+                                     emms-source-file-default-directory
+                                     t)
                 (read-from-minibuffer "Find files matching: ")))
   (mapcar (lambda (file)
             (emms-track 'file file))
Index: emms.el
===================================================================
RCS file: /cvsroot/emms/emms/emms.el,v
retrieving revision 1.36
diff -u -r1.36 emms.el
--- emms.el     25 Mar 2005 21:08:23 -0000      1.36
+++ emms.el     25 Apr 2005 13:31:48 -0000
@@ -548,7 +548,7 @@
       (error "A player is already playing")
     (let ((player (emms-player-for track)))
       (if (not player)
-          (error "Don't know how to play track: " track)
+          (error "Don't know how to play track: %s" track)
         (funcall (emms-player-get player 'start)
                  track)
         (setq emms-

-- 
Daniel Brockman <address@hidden>