Fix compilation warnings and don't clobber namespace

darcs-hash:20060822130608-1bfb2-c2a7fc4a64e0c781bb8727f4a70efbd72e3e3d0c.gz

3 files changed, 42 insertions, 32 deletions

diff --git a/emms-browser.el b/emms-browser.el
index 52a0eed..2ba8f18 100644
--- a/emms-browser.el
+++ b/emms-browser.el
@@ -418,6 +418,24 @@ Use nil for no sorting."
   "Keymap for `emms-browser-mode'.")
 
 ;; --------------------------------------------------
+;; Compatability functions
+;; --------------------------------------------------
+
+(eval-and-compile
+  (if (fboundp 'with-selected-window)
+      (defalias 'emms-browser-with-selected-window 'with-selected-window)
+    (defmacro emms-browser-with-selected-window (window &rest body)
+      ;; this emulates the behavior introduced earlier, though it
+      ;; might be best to do something with `window'
+      `(save-selected-window ,body)))
+  (put 'emms-browser-with-selected-window 'lisp-indent-function 1)
+  (put 'emms-browser-with-selected-window 'edebug-form-spec '(form body))
+
+  (if (fboundp 'run-mode-hooks)
+      (defalias 'emms-browser-run-mode-hooks 'run-mode-hooks)
+    (defalias 'emms-browser-run-mode-hooks 'run-hooks)))
+
+;; --------------------------------------------------
 ;; General mode setup
 ;; --------------------------------------------------
 
@@ -440,7 +458,7 @@ example function is `emms-browse-by-artist'."
           (if wind
               (select-window wind)
             (switch-to-buffer buf))
-          (run-mode-hooks 'emms-browser-show-display-hook))
+          (emms-browser-run-mode-hooks 'emms-browser-show-display-hook))
       ;; if there's no buffer, create a new window
       (emms-browser-create)
       (emms-browse-by type))))
@@ -449,7 +467,7 @@ example function is `emms-browse-by-artist'."
   "Create a new emms-browser buffer and start emms-browser-mode."
   (emms-browser-new-buffer)
   (emms-browser-mode)
-  (run-mode-hooks 'emms-browser-show-display-hook))
+  (emms-browser-run-mode-hooks 'emms-browser-show-display-hook))
 
 (defun emms-browser-mode (&optional no-update)
   "A major mode for the Emms browser.
@@ -493,7 +511,7 @@ example function is `emms-browse-by-artist'."
 (defun emms-browser-bury-buffer ()
   "Bury the browser buffer, running hooks."
   (interactive)
-  (run-mode-hooks 'emms-browser-hide-display-hook)
+  (emms-browser-run-mode-hooks 'emms-browser-hide-display-hook)
   (bury-buffer))
 
 ;; --------------------------------------------------
@@ -1184,7 +1202,7 @@ configuration."
                    (when
                        (setq playlist-window
                              (emms-browser-get-linked-window))
-                     (with-selected-window
+                     (emms-browser-with-selected-window
                          playlist-window
                        (goto-char start-of-tracks)
                        (recenter '(4)))))))
@@ -1427,21 +1445,6 @@ If > album level, most of the track data will not make sense."
    emms-browser-current-indent
    (make-string (* 1 (1- level)) ?\  )))
 
-(defun emms-browser-get-format (bdata target)
-  (let* ((type (emms-browser-bdata-type bdata))
-         (target-str (or
-                      (and (eq target 'browser) "")
-                      (concat (symbol-name target) "-")))
-         (sym
-          (intern
-           (concat "emms-browser-"
-                   target-str
-                   (symbol-name type)
-                   "-format"))))
-    (if (boundp sym)
-        (symbol-value sym)
-      emms-browser-default-format)))
-
 (defun emms-browser-format-elem (format-string elem)
   (cdr (assoc elem format-string)))
 
@@ -1571,6 +1574,21 @@ the text that it generates."
 (defvar emms-browser-playlist-info-title-format
   'emms-browser-track-artist-and-title-format)
 
+(defun emms-browser-get-format (bdata target)
+  (let* ((type (emms-browser-bdata-type bdata))
+         (target-str (or
+                      (and (eq target 'browser) "")
+                      (concat (symbol-name target) "-")))
+         (sym
+          (intern
+           (concat "emms-browser-"
+                   target-str
+                   (symbol-name type)
+                   "-format"))))
+    (if (boundp sym)
+        (symbol-value sym)
+      emms-browser-default-format)))
+
 (defun emms-browser-track-artist-and-title-format (bdata fmt)
   (concat
    "%i"
@@ -1713,15 +1731,5 @@ If the track is not of TYPE, return t."
                        (emms-track-get track 'last-played nil))
                  (time-less-p min-date last-played))))))
 
-;; --------------------------------------------------
-;; Compatability functions
-;; --------------------------------------------------
-
-(unless (fboundp 'with-selected-window)
-  (defalias 'with-selected-window 'save-selected-window))
-
-(unless (fboundp 'run-mode-hooks)
-  (defalias 'run-mode-hooks 'run-hooks))
-
 (provide 'emms-browser)
 ;;; emms-browser.el ends here
diff --git a/emms-cache.el b/emms-cache.el
index 409a24a..5abd697 100644
--- a/emms-cache.el
+++ b/emms-cache.el
@@ -41,6 +41,7 @@
 ;;; Code:
 
 (require 'emms)
+(require 'emms-info)
 
 (when (fboundp 'define-hash-table-test)
   (define-hash-table-test 'string-hash 'string= 'sxhash))
diff --git a/emms.el b/emms.el
index e19f7dc..69201c2 100644
--- a/emms.el
+++ b/emms.el
@@ -436,9 +436,10 @@ If fifth arg LITERAL is non-nil, insert REPLACEMENT literally."
     (replace-in-string text regexp replacement literal))
    (t (let ((repl-len (length replacement))
             start)
-        (while (setq start (string-match regexp text start))
-          (setq start (+ start repl-len)
-                text (replace-match replacement fixedcase literal text))))
+        (save-match-data
+          (while (setq start (string-match regexp text start))
+            (setq start (+ start repl-len)
+                  text (replace-match replacement fixedcase literal text)))))
       text)))
 
 (defun emms-line-number-at-pos (&optional pos)