aboutsummaryrefslogtreecommitdiff
path: root/lisp/emms-browser.el
diff options
context:
space:
mode:
authorYoni Rabkin <yoni@rabkins.net>2017-07-14 16:16:21 -0400
committerYoni Rabkin <yoni@rabkins.net>2017-07-14 16:16:21 -0400
commit5401b0df9b4a45fb9f01b7f4236f99b34c79595a (patch)
treeecf5a37d4a06ca5a278b70d7a35c37ecae60a121 /lisp/emms-browser.el
parenta4ec6697e45a006753bfd79c22f14524748df493 (diff)
Move from cl to cl-lib.
Patch by tumashu <tumashu@163.com>.
Diffstat (limited to 'lisp/emms-browser.el')
-rw-r--r--lisp/emms-browser.el7
1 files changed, 3 insertions, 4 deletions
diff --git a/lisp/emms-browser.el b/lisp/emms-browser.el
index 94f0072..590a736 100644
--- a/lisp/emms-browser.el
+++ b/lisp/emms-browser.el
@@ -286,14 +286,13 @@
;;; Code:
+(require 'cl-lib)
(require 'emms)
(require 'emms-cache)
(require 'emms-source-file)
(require 'emms-playlist-sort)
(require 'sort)
-(eval-when-compile
- (require 'cl))
;; --------------------------------------------------
;; Variables and configuration
@@ -1068,7 +1067,7 @@ If DIRECTION is 1, move forward, otherwise move backwards."
(emms-browser-kill-subitems)
(if (emms-browser-subitems-exist)
(emms-browser-show-subitems)
- (assert (emms-browser-move-up-level))
+ (cl-assert (emms-browser-move-up-level))
(emms-browser-kill-subitems))))
(defun emms-browser-show-subitems ()
@@ -1637,7 +1636,7 @@ Based on from `emms-browser-covers' and
emms-browser-covers)))
(defun emms-browser-get-cover-from-album (bdata &optional size)
- (assert (eq (emms-browser-bdata-type bdata) 'info-album))
+ (cl-assert (eq (emms-browser-bdata-type bdata) 'info-album))
(let* ((track1data (emms-browser-bdata-data bdata))
(track1 (car (emms-browser-bdata-data (car track1data))))
(path (emms-track-get track1 'name)))