Fix use of `message', silence mpd-show if callback given and no song playing

darcs-hash:20070408233853-1bfb2-c36da9a1961e7186ea3afd81445a011500cd7d64.gz

3 files changed, 6 insertions, 5 deletions

diff --git a/emms-bookmarks.el b/emms-bookmarks.el
index 5bbd9aa..e5e20b3 100644
--- a/emms-bookmarks.el
+++ b/emms-bookmarks.el
@@ -100,8 +100,8 @@ FAILURE-MESSAGE should be a string."
     (if m
 	(progn
 	  (emms-player-seek-to (cdr m))
-	  (message (car m)))
-      (message failure-message))))
+	  (message "%s" (car m)))
+      (message "%s" failure-message))))
 
 
 ;; entry points
diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index b5fb198..d96b031 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -642,7 +642,7 @@ MusicPD playlist."
         (err-msg (cdr (assoc "error" info))))
     (if (stringp err-msg)
         (progn
-          (message (concat "MusicPD error: " err-msg))
+          (message "MusicPD error: %s" err-msg)
           (emms-player-mpd-send
            "clearerror"
            nil #'ignore))
@@ -1024,7 +1024,8 @@ positive or negative."
                              (concat desc ": " track-desc)
                            track-desc))))))
       (if (not desc)
-          (message "Nothing playing right now")
+          (unless (functionp callback)
+            (message "Nothing playing right now"))
         (setq desc (format emms-show-format desc))
         (cond ((functionp callback)
                (funcall callback buffer desc))
diff --git a/emms-stream-info.el b/emms-stream-info.el
index aee486c..779bbbc 100644
--- a/emms-stream-info.el
+++ b/emms-stream-info.el
@@ -334,7 +334,7 @@ not output a message and only return a string."
     (when (emms-stream-info-get-key "name")
       (if string-out
 	  str
-	(message str)))))
+	(message "%s" str)))))
 
 (defun emms-stream-info-pretty-print-insert ()
   "Insert the formatted output of 'emms-stream-info-get' at point."