Fix a variety of compilation errors and warnings.

darcs-hash:20060401232610-1bfb2-5fe5e4892c94e29a59738bf0d27e7e91ad68f2ed.gz

1 files changed, 12 insertions, 5 deletions

diff --git a/emms-playlist-sort.el b/emms-playlist-sort.el
index 2346d7e..ee3671a 100644
--- a/emms-playlist-sort.el
+++ b/emms-playlist-sort.el
@@ -59,11 +59,17 @@
      (> (emms-score-get-score (emms-track-get a 'name))
 	(emms-score-get-score (emms-track-get b 'name))))))
 
+(defgroup emms-playlist-sort nil
+  "*Sorting Emacs Multimedia System playlists."
+  :prefix "emms-playlist-sort-"
+  :group 'emms)
+
 ;; FIXME: Should better avoid relying on setting before loading.
 (defcustom emms-playlist-sort-prefix "S"
   "*Prefix key sequence for `emms-playlist-sort-map'.
 You should set this variable before loading this file."
-  :type 'string)
+  :type 'string
+  :group 'emms-playlist-sort)
 
 (defvar emms-playlist-sort-map
   (let ((map (make-sparse-keymap)))
@@ -75,10 +81,11 @@ You should set this variable before loading this file."
     (define-key map (kbd "o") 'emms-playlist-sort-by-info-note)
     map))
 
-(eval-after-load "emms-playlist-sort.el"
-  (define-key emms-playlist-mode-map
-    emms-playlist-sort-prefix
-    emms-playlist-sort-map))
+(eval-after-load "emms-playlist-mode"
+  (and (boundp 'emms-playlist-mode-map)
+       (define-key emms-playlist-mode-map
+         emms-playlist-sort-prefix
+         emms-playlist-sort-map)))
 
 (defun emms-playlist-sort (predicate)
   "Sort the whole playlist buffer by PREDICATE."