From 5401b0df9b4a45fb9f01b7f4236f99b34c79595a Mon Sep 17 00:00:00 2001 From: Yoni Rabkin Date: Fri, 14 Jul 2017 16:16:21 -0400 Subject: Move from cl to cl-lib. Patch by tumashu . --- lisp/emms-volume-pulse.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lisp/emms-volume-pulse.el') diff --git a/lisp/emms-volume-pulse.el b/lisp/emms-volume-pulse.el index 7fc6de5..a3f9620 100644 --- a/lisp/emms-volume-pulse.el +++ b/lisp/emms-volume-pulse.el @@ -42,7 +42,7 @@ ;;; Code: -(eval-when-compile (require 'cl)) +(require 'cl-lib) ;; TODO: it would be great if custom could have ;; choices based on pactl list short sinks | cut -f1-2 @@ -77,18 +77,18 @@ See full list of devices on your system by running (if sink-number-p 'assq 'assoc) emms-volume-pulse-sink (mapcar (if sink-number-p 'identity 'cdr) - (loop while - (string-match - (mapconcat 'identity - '(".*Sink[ \t]+\\#\\([0-9]\\)" - ".*Name:[ \t]\\([^\n]+\\)" - ".*Volume:.*?\\([0-9]+\\)%.*\n?") - "\n") - output) - collect (list (string-to-number (match-string 1 output)) - (match-string 2 output) - (match-string 3 output)) - do (setq output (replace-match "" nil nil output)))))))))) + (cl-loop while + (string-match + (mapconcat 'identity + '(".*Sink[ \t]+\\#\\([0-9]\\)" + ".*Name:[ \t]\\([^\n]+\\)" + ".*Volume:.*?\\([0-9]+\\)%.*\n?") + "\n") + output) + collect (list (string-to-number (match-string 1 output)) + (match-string 2 output) + (match-string 3 output)) + do (setq output (replace-match "" nil nil output)))))))))) ;;;###autoload -- cgit v1.2.3