aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2006-10-04 03:22:00 +0000
committerMichael Olson <mwolson@gnu.org>2006-10-04 03:22:00 +0000
commit0c4b2d14c042f9d5bb044019822018eb0dfe4408 (patch)
tree671a3054a4d5d60bc639f5ba312e65d67bac12bd
parent2e8093272bef16a36d8e0164fe6e7ebb00a9e775 (diff)
emms-player-mpd: Only display error if we are certain that url.el is not up-to-date
darcs-hash:20061004032213-1bfb2-090d7e68e56bc4639df136e47a67c5b0966fd9c0.gz
-rw-r--r--emms-player-mpd.el10
1 files changed, 4 insertions, 6 deletions
diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index e014aa0..ef07624 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -686,12 +686,10 @@ Execute CALLBACK with CLOSURE as its first argument when done."
Execute CALLBACK with CLOSURE as its first argument when done."
;; This is useful with emms-streams.el
- (condition-case nil
- (progn
- (require 'url)
- (with-temp-buffer
- (url-insert-file-contents url)
- (emms-player-mpd-add-buffer-contents closure callback)))
+ (if (fboundp 'url-insert-file-contents)
+ (with-temp-buffer
+ (url-insert-file-contents url)
+ (emms-player-mpd-add-buffer-contents closure callback))
(error (message (concat "You need to install url.el so that"
" Emms can retrieve this stream")))))