[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/emms a51ac5b 3/5: Change the function quoting style to
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] externals/emms a51ac5b 3/5: Change the function quoting style to help the compiler. |
|
Date: |
Wed, 21 Apr 2021 19:08:36 -0400 (EDT) |
branch: externals/emms
commit a51ac5b1fa967413d81530a722a5866eb43c4e4b
Author: Yoni Rabkin <yoni@rabkins.net>
Commit: Yoni Rabkin <yoni@rabkins.net>
Change the function quoting style to help the compiler.
Patch by Stefan Monnier
---
emms-browser.el | 87 ++++++++++++++++++++++----------------------
emms-lyrics.el | 15 ++++----
emms-mark.el | 22 +++++------
emms-metaplaylist-mode.el | 20 +++++-----
emms-mode-line-icon.el | 4 +-
emms-mode-line.el | 18 ++++-----
emms-player-mpd.el | 20 +++++-----
emms-player-mpg321-remote.el | 12 +++---
emms-player-mpv.el | 6 +--
emms-player-simple.el | 6 +--
emms-player-vlc.el | 6 +--
emms-playing-time.el | 28 +++++++-------
emms-playlist-limit.el | 20 +++++-----
emms-playlist-mode.el | 76 +++++++++++++++++++-------------------
emms-playlist-sort.el | 32 ++++++++--------
emms-score.el | 11 +++---
emms-setup.el | 8 ++--
emms-show-all.el | 14 +++----
emms-source-file.el | 2 +-
emms-tag-editor.el | 40 ++++++++++----------
emms-volume-pulse.el | 6 +--
emms-volume.el | 6 +--
emms.el | 19 +++++-----
jack.el | 11 +++---
24 files changed, 245 insertions(+), 244 deletions(-)
diff --git a/emms-browser.el b/emms-browser.el
index 070efd4..78c9626 100644
--- a/emms-browser.el
+++ b/emms-browser.el
@@ -286,6 +286,7 @@
(require 'cl-lib)
(require 'emms)
(require 'emms-cache)
+(require 'emms-volume)
(require 'emms-source-file)
(require 'emms-playlist-sort)
(require 'sort)
@@ -422,55 +423,55 @@ Called once for each directory."
(defvar emms-browser-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map (kbd "q") 'emms-browser-bury-buffer)
- (define-key map (kbd "/") 'emms-isearch-buffer)
- (define-key map (kbd "r") 'emms-browser-goto-random)
- (define-key map (kbd "n") 'next-line)
- (define-key map (kbd "p") 'previous-line)
- (define-key map (kbd "C") 'emms-browser-clear-playlist)
- (define-key map (kbd "?") 'describe-mode)
- (define-key map (kbd "C-/") 'emms-playlist-mode-undo)
- (define-key map (kbd "SPC") 'emms-browser-toggle-subitems)
- (define-key map (kbd "^") 'emms-browser-move-up-level)
- (define-key map (kbd "RET") 'emms-browser-add-tracks)
- (define-key map (kbd "<C-return>") 'emms-browser-add-tracks-and-play)
- (define-key map (kbd "C-j") 'emms-browser-add-tracks-and-play)
- (define-key map (kbd "<tab>") 'emms-browser-next-non-track)
- (define-key map (kbd "<backtab>") 'emms-browser-prev-non-track)
- (define-key map (kbd "d") 'emms-browser-view-in-dired)
- (define-key map (kbd "D") 'emms-browser-delete-files)
- (define-key map (kbd "E") 'emms-browser-expand-all)
- (define-key map (kbd "1") 'emms-browser-collapse-all)
- (define-key map (kbd "2") 'emms-browser-expand-to-level-2)
- (define-key map (kbd "3") 'emms-browser-expand-to-level-3)
- (define-key map (kbd "4") 'emms-browser-expand-to-level-4)
- (define-key map (kbd "b 1") 'emms-browse-by-artist)
- (define-key map (kbd "b 2") 'emms-browse-by-album)
- (define-key map (kbd "b 3") 'emms-browse-by-genre)
- (define-key map (kbd "b 4") 'emms-browse-by-year)
- (define-key map (kbd "b 5") 'emms-browse-by-composer)
- (define-key map (kbd "b 6") 'emms-browse-by-performer)
- (define-key map (kbd "s a") 'emms-browser-search-by-artist)
- (define-key map (kbd "s c") 'emms-browser-search-by-composer)
- (define-key map (kbd "s p") 'emms-browser-search-by-performer)
- (define-key map (kbd "s A") 'emms-browser-search-by-album)
- (define-key map (kbd "s t") 'emms-browser-search-by-title)
- (define-key map (kbd "s s") 'emms-browser-search-by-names)
- (define-key map (kbd "W A w") 'emms-browser-lookup-artist-on-wikipedia)
- (define-key map (kbd "W C w") 'emms-browser-lookup-composer-on-wikipedia)
- (define-key map (kbd "W P w") 'emms-browser-lookup-performer-on-wikipedia)
- (define-key map (kbd "W a w") 'emms-browser-lookup-album-on-wikipedia)
- (define-key map (kbd ">") 'emms-browser-next-filter)
- (define-key map (kbd "<") 'emms-browser-previous-filter)
- (define-key map (kbd "+") 'emms-volume-raise)
- (define-key map (kbd "-") 'emms-volume-lower)
+ (define-key map (kbd "q") #'emms-browser-bury-buffer)
+ (define-key map (kbd "/") #'emms-isearch-buffer)
+ (define-key map (kbd "r") #'emms-browser-goto-random)
+ (define-key map (kbd "n") #'next-line)
+ (define-key map (kbd "p") #'previous-line)
+ (define-key map (kbd "C") #'emms-browser-clear-playlist)
+ (define-key map (kbd "?") #'describe-mode)
+ (define-key map (kbd "C-/") #'emms-playlist-mode-undo)
+ (define-key map (kbd "SPC") #'emms-browser-toggle-subitems)
+ (define-key map (kbd "^") #'emms-browser-move-up-level)
+ (define-key map (kbd "RET") #'emms-browser-add-tracks)
+ (define-key map (kbd "<C-return>") #'emms-browser-add-tracks-and-play)
+ (define-key map (kbd "C-j") #'emms-browser-add-tracks-and-play)
+ (define-key map (kbd "<tab>") #'emms-browser-next-non-track)
+ (define-key map (kbd "<backtab>") #'emms-browser-prev-non-track)
+ (define-key map (kbd "d") #'emms-browser-view-in-dired)
+ (define-key map (kbd "D") #'emms-browser-delete-files)
+ (define-key map (kbd "E") #'emms-browser-expand-all)
+ (define-key map (kbd "1") #'emms-browser-collapse-all)
+ (define-key map (kbd "2") #'emms-browser-expand-to-level-2)
+ (define-key map (kbd "3") #'emms-browser-expand-to-level-3)
+ (define-key map (kbd "4") #'emms-browser-expand-to-level-4)
+ (define-key map (kbd "b 1") #'emms-browse-by-artist)
+ (define-key map (kbd "b 2") #'emms-browse-by-album)
+ (define-key map (kbd "b 3") #'emms-browse-by-genre)
+ (define-key map (kbd "b 4") #'emms-browse-by-year)
+ (define-key map (kbd "b 5") #'emms-browse-by-composer)
+ (define-key map (kbd "b 6") #'emms-browse-by-performer)
+ (define-key map (kbd "s a") #'emms-browser-search-by-artist)
+ (define-key map (kbd "s c") #'emms-browser-search-by-composer)
+ (define-key map (kbd "s p") #'emms-browser-search-by-performer)
+ (define-key map (kbd "s A") #'emms-browser-search-by-album)
+ (define-key map (kbd "s t") #'emms-browser-search-by-title)
+ (define-key map (kbd "s s") #'emms-browser-search-by-names)
+ (define-key map (kbd "W A w") #'emms-browser-lookup-artist-on-wikipedia)
+ (define-key map (kbd "W C w") #'emms-browser-lookup-composer-on-wikipedia)
+ (define-key map (kbd "W P w") #'emms-browser-lookup-performer-on-wikipedia)
+ (define-key map (kbd "W a w") #'emms-browser-lookup-album-on-wikipedia)
+ (define-key map (kbd ">") #'emms-browser-next-filter)
+ (define-key map (kbd "<") #'emms-browser-previous-filter)
+ (define-key map (kbd "+") #'emms-volume-raise)
+ (define-key map (kbd "-") #'emms-volume-lower)
map)
"Keymap for `emms-browser-mode'.")
(defvar emms-browser-search-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map emms-browser-mode-map)
- (define-key map (kbd "q") 'emms-browser-kill-search)
+ (define-key map (kbd "q") #'emms-browser-kill-search)
map)
"Keymap for `emms-browser-mode'.")
diff --git a/emms-lyrics.el b/emms-lyrics.el
index 9c0304a..8d482ec 100644
--- a/emms-lyrics.el
+++ b/emms-lyrics.el
@@ -235,10 +235,11 @@ If we can't find it from local disk, then search it from
internet."
(if (fboundp 'eww)
(progn (require 'eww)
(let ((readable-hook (when (fboundp 'eww-readable)
- (add-hook 'eww-after-render-hook
'eww-readable))))
+ (add-hook 'eww-after-render-hook
#'eww-readable)
+ #'eww-readable)))
(eww url)
(when readable-hook
- (remove-hook 'eww-after-render-hook 'eww-readable))))
+ (remove-hook 'eww-after-render-hook readable-hook))))
(browse-url url))
(message "Lyric file does not exist on file-system. Searching
online...")))))
@@ -422,7 +423,7 @@ job."
(list
(run-at-time (format "%d sec" time)
nil
- 'emms-lyrics-display-handler
+ #'emms-lyrics-display-handler
lyric
next-lyric
line
@@ -512,7 +513,7 @@ NEXT-LYRIC."
(list
(run-at-time time
nil
- 'emms-lyrics-display
+ #'emms-lyrics-display
(if (>= (length lyric) pos)
(substring scrolled-lyric pos)
(throw 'return t))
@@ -525,9 +526,9 @@ NEXT-LYRIC."
(defvar emms-lyrics-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map "p" 'emms-lyrics-previous-line)
- (define-key map "n" 'emms-lyrics-next-line)
- (define-key map "i" 'emms-lyrics-insert-time)
+ (define-key map "p" #'emms-lyrics-previous-line)
+ (define-key map "n" #'emms-lyrics-next-line)
+ (define-key map "i" #'emms-lyrics-insert-time)
map)
"Keymap for `emms-lyrics-mode'.")
diff --git a/emms-mark.el b/emms-mark.el
index ec9960c..b640e12 100644
--- a/emms-mark.el
+++ b/emms-mark.el
@@ -1,6 +1,6 @@
;;; emms-mark.el --- mark track like dired -*- lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;;
;; Author: Ye Wenbin <wenbinye@163.com>
@@ -240,18 +240,18 @@ this function collects the result of FUNC."
;;{{{ mode stuff
(defvar emms-mark-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map "W" 'emms-mark-copy-marked-tracks)
- (define-key map "K" 'emms-mark-kill-marked-tracks)
- (define-key map "D" 'emms-mark-delete-marked-tracks)
- (define-key map "m" 'emms-mark-forward)
- (define-key map "u" 'emms-mark-unmark-forward)
- (define-key map "U" 'emms-mark-unmark-all)
- (define-key map "t" 'emms-mark-toggle)
- (define-key map "%m" 'emms-mark-regexp)
+ (define-key map "W" #'emms-mark-copy-marked-tracks)
+ (define-key map "K" #'emms-mark-kill-marked-tracks)
+ (define-key map "D" #'emms-mark-delete-marked-tracks)
+ (define-key map "m" #'emms-mark-forward)
+ (define-key map "u" #'emms-mark-unmark-forward)
+ (define-key map "U" #'emms-mark-unmark-all)
+ (define-key map "t" #'emms-mark-toggle)
+ (define-key map "%m" #'emms-mark-regexp)
map)
"Keymap for `emms-mark-mode'.")
-(defun emms-mark-mode ()
+(defun emms-mark-mode () ;FIXME: Use `define-derived-mode'.
"An EMMS major mode that allows tracks to be marked like dired.
\\{emms-mark-mode-map}"
(interactive)
@@ -272,7 +272,7 @@ this function collects the result of FUNC."
;; show a blank space at beginning of each line
(set (make-local-variable 'emms-track-description-function)
- 'emms-mark-track-description)
+ #'emms-mark-track-description)
(emms-mark-update-descriptions)))
(defun emms-mark-mode-disable ()
diff --git a/emms-metaplaylist-mode.el b/emms-metaplaylist-mode.el
index 5e78226..2b9c109 100644
--- a/emms-metaplaylist-mode.el
+++ b/emms-metaplaylist-mode.el
@@ -77,16 +77,16 @@
(defvar emms-metaplaylist-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map text-mode-map)
- (define-key map (kbd "n") 'next-line)
- (define-key map (kbd "p") 'previous-line)
- (define-key map (kbd "RET") 'emms-metaplaylist-mode-goto-current)
- (define-key map (kbd "SPC") 'emms-metaplaylist-mode-set-active)
- (define-key map (kbd "g") 'emms-metaplaylist-mode-update)
- (define-key map (kbd "C") 'emms-metaplaylist-mode-new-buffer)
- (define-key map (kbd "C-k") 'emms-metaplaylist-mode-kill-buffer)
- (define-key map (kbd "c") 'emms-metaplaylist-mode-center-current)
- (define-key map (kbd "q") 'kill-this-buffer)
- (define-key map (kbd "?") 'describe-mode)
+ (define-key map (kbd "n") #'next-line)
+ (define-key map (kbd "p") #'previous-line)
+ (define-key map (kbd "RET") #'emms-metaplaylist-mode-goto-current)
+ (define-key map (kbd "SPC") #'emms-metaplaylist-mode-set-active)
+ (define-key map (kbd "g") #'emms-metaplaylist-mode-update)
+ (define-key map (kbd "C") #'emms-metaplaylist-mode-new-buffer)
+ (define-key map (kbd "C-k") #'emms-metaplaylist-mode-kill-buffer)
+ (define-key map (kbd "c") #'emms-metaplaylist-mode-center-current)
+ (define-key map (kbd "q") #'kill-this-buffer)
+ (define-key map (kbd "?") #'describe-mode)
map)
"Keymap for `emms-metaplaylist-mode'.")
diff --git a/emms-mode-line-icon.el b/emms-mode-line-icon.el
index 46bc4e7..5e82e4e 100644
--- a/emms-mode-line-icon.el
+++ b/emms-mode-line-icon.el
@@ -1,6 +1,6 @@
;; emms-mode-line-icon.el --- show an icon in the Emacs mode-line -*-
lexical-binding: t; -*-
-;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2021 Free Software Foundation, Inc.
;; Version: 1.1
;; Keywords: emms
@@ -77,7 +77,7 @@ static char *note[] = {
(emms-mode-line-playlist-current))
(emms-mode-line-playlist-current)))
-(setq emms-mode-line-mode-line-function 'emms-mode-line-icon-function)
+(setq emms-mode-line-mode-line-function #'emms-mode-line-icon-function)
;; This is needed for text properties to work in the mode line.
(put 'emms-mode-line-string 'risky-local-variable t)
diff --git a/emms-mode-line.el b/emms-mode-line.el
index 2c49075..f35750d 100644
--- a/emms-mode-line.el
+++ b/emms-mode-line.el
@@ -38,7 +38,7 @@
:prefix "emms-mode-line-"
:group 'emms)
-(defcustom emms-mode-line-mode-line-function 'emms-mode-line-playlist-current
+(defcustom emms-mode-line-mode-line-function #'emms-mode-line-playlist-current
"Function for showing infos in mode-line or nil if don't want to."
:type '(choice (const :tag "Don't show info on mode-line" nil) function))
@@ -69,10 +69,10 @@
(if (and arg (> arg 0))
(progn
(setq emms-mode-line-active-p t)
- (add-hook 'emms-track-updated-functions 'emms-mode-line-alter)
- (add-hook 'emms-player-finished-hook 'emms-mode-line-blank)
- (add-hook 'emms-player-stopped-hook 'emms-mode-line-blank)
- (add-hook 'emms-player-started-hook 'emms-mode-line-alter)
+ (add-hook 'emms-track-updated-functions #'emms-mode-line-alter)
+ (add-hook 'emms-player-finished-hook #'emms-mode-line-blank)
+ (add-hook 'emms-player-stopped-hook #'emms-mode-line-blank)
+ (add-hook 'emms-player-started-hook #'emms-mode-line-alter)
(when (and emms-mode-line-mode-line-function
(not (member 'emms-mode-line-string global-mode-string)))
(setq global-mode-string
@@ -80,10 +80,10 @@
'(emms-mode-line-string))))
(when emms-player-playing-p (emms-mode-line-alter)))
(setq emms-mode-line-active-p nil)
- (remove-hook 'emms-track-updated-functions 'emms-mode-line-alter)
- (remove-hook 'emms-player-finished-hook 'emms-mode-line-blank)
- (remove-hook 'emms-player-stopped-hook 'emms-mode-line-blank)
- (remove-hook 'emms-player-started-hook 'emms-mode-line-alter)
+ (remove-hook 'emms-track-updated-functions #'emms-mode-line-alter)
+ (remove-hook 'emms-player-finished-hook #'emms-mode-line-blank)
+ (remove-hook 'emms-player-stopped-hook #'emms-mode-line-blank)
+ (remove-hook 'emms-player-started-hook #'emms-mode-line-alter)
(emms-mode-line-restore-titlebar)
(emms-mode-line-restore-mode-line)))
diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index 1a4f407..7ae48dc 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -73,11 +73,11 @@
;; To get track info from MusicPD, do the following.
;;
-;; (add-to-list 'emms-info-functions 'emms-info-mpd)
+;; (add-to-list 'emms-info-functions #'emms-info-mpd)
;; To change the volume using MusicPD, do the following.
;;
-;; (setq emms-volume-change-function 'emms-volume-mpd-change)
+;; (setq emms-volume-change-function #'emms-volume-mpd-change)
;; Add 'emms-player-mpd to the top of `emms-player-list'.
;;
@@ -122,9 +122,9 @@
:group 'emms-player
:prefix "emms-player-mpd-")
-(defcustom emms-player-mpd (emms-player 'emms-player-mpd-start
- 'emms-player-mpd-stop
- 'emms-player-mpd-playable-p)
+(defcustom emms-player-mpd (emms-player #'emms-player-mpd-start
+ #'emms-player-mpd-stop
+ #'emms-player-mpd-playable-p)
"Parameters for the MusicPD player."
:type '(cons symbol alist))
@@ -308,7 +308,7 @@ return at the end of a request.")
:service emms-player-mpd-server-name
:family 'local)))
(set-process-sentinel emms-player-mpd-process
- 'emms-player-mpd-sentinel)
+ #'emms-player-mpd-sentinel)
(setq emms-player-mpd-queue
(tq-create emms-player-mpd-process))
(if (fboundp 'set-process-query-on-exit-flag)
@@ -876,7 +876,7 @@ playlist."
(if emms-player-mpd-check-interval
(setq emms-player-mpd-status-timer
(run-at-time t emms-player-mpd-check-interval
- 'emms-player-mpd-detect-song-change))
+ #'emms-player-mpd-detect-song-change))
(emms-player-mpd-detect-song-change)))))
;; we only want to play one track, so don't start the timer
(emms-player-mpd-send
@@ -947,7 +947,7 @@ This is called if `emms-player-mpd-sync-playlist' is
non-nil."
(when emms-player-mpd-check-interval
(setq emms-player-mpd-status-timer
(run-at-time t emms-player-mpd-check-interval
- 'emms-player-mpd-detect-song-change))))))
+ #'emms-player-mpd-detect-song-change))))))
;;;###autoload
(defun emms-player-mpd-connect ()
@@ -1297,7 +1297,7 @@ Afterwards, clear the EMMS cache and call
(progn
(message "Updating DB with ID %s. Waiting for the update to
finish..." id)
(setq emms-player-mpd-waiting-for-update-timer
- (run-at-time 1 nil 'emms-player-mpd-wait-for-update)))
+ (run-at-time 1 nil #'emms-player-mpd-wait-for-update)))
(message "Could not update the DB")))
;; Otherwise, check if update is still in progress
(emms-player-mpd-get-status-part
@@ -1306,7 +1306,7 @@ Afterwards, clear the EMMS cache and call
(ignore closure)
(if updating
;; MPD update still in progress, so wait another second
- (run-at-time 1 nil 'emms-player-mpd-wait-for-update)
+ (run-at-time 1 nil #'emms-player-mpd-wait-for-update)
;; MPD update finished
(setq emms-player-mpd-waiting-for-update-timer nil)
(message "MPD update finished.")
diff --git a/emms-player-mpg321-remote.el b/emms-player-mpg321-remote.el
index a61b4a0..5ed942b 100644
--- a/emms-player-mpg321-remote.el
+++ b/emms-player-mpg321-remote.el
@@ -58,9 +58,9 @@ For example: (list \"-o\" \"alsa\")"
:type '(repeat string))
(defcustom emms-player-mpg321-remote
- (emms-player 'emms-player-mpg321-remote-start-playing
- 'emms-player-mpg321-remote-stop-playing
- 'emms-player-mpg321-remote-playable-p)
+ (emms-player #'emms-player-mpg321-remote-start-playing
+ #'emms-player-mpg321-remote-stop-playing
+ #'emms-player-mpg321-remote-playable-p)
"A player for EMMS."
:type '(cons symbol alist))
@@ -93,14 +93,14 @@ For example: (list \"-o\" \"alsa\")"
(defun emms-player-mpg321-remote-start-process ()
"Start a new remote process, and return the process."
- (let ((process (apply 'start-process
+ (let ((process (apply #'start-process
emms-player-mpg321-remote-process-name
nil
emms-player-mpg321-remote-command
(append emms-player-mpg321-remote-initial-args
emms-player-mpg321-remote-parameters))))
- (set-process-sentinel process 'emms-player-mpg321-remote-sentinel)
- (set-process-filter process 'emms-player-mpg321-remote-filter)
+ (set-process-sentinel process #'emms-player-mpg321-remote-sentinel)
+ (set-process-filter process #'emms-player-mpg321-remote-filter)
process))
(defun emms-player-mpg321-remote-stop ()
diff --git a/emms-player-mpv.el b/emms-player-mpv.el
index 7d9099a..922f870 100644
--- a/emms-player-mpv.el
+++ b/emms-player-mpv.el
@@ -1,6 +1,6 @@
;;; emms-player-mpv.el --- mpv support for EMMS -*- lexical-binding: t; -*-
;;
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2021 Free Software Foundation, Inc.
;; Authors: Mike Kazantsev <mk.fraggod@gmail.com>
@@ -277,7 +277,7 @@ Strips whitespace from start/end of TPL-OR-MSG and strings
in TPL-VALUES."
(setq tpl-or-msg (replace-regexp-in-string "%" "%%" tpl-or-msg t t)))
(let ((ts (float-time)))
(unless emms-player-mpv-debug-ts-offset (setq
emms-player-mpv-debug-ts-offset ts))
- (apply 'message
+ (apply #'message
(concat "emms-player-mpv %.1f " tpl-or-msg)
(- ts emms-player-mpv-debug-ts-offset)
tpl-values))))
@@ -816,7 +816,7 @@ if there was any issue when trying to start it initially."
track-name 'replace))
(start-func `(lambda ()
(emms-player-mpv-cmd ',start-cmd
- (apply-partially
'emms-player-mpv-start-error-handler ',start-cmd)))))
+ (apply-partially
#'emms-player-mpv-start-error-handler ',start-cmd)))))
(if emms-player-mpv-ipc-stop-command
(setq emms-player-mpv-ipc-stop-command start-func)
(funcall start-func))))))
diff --git a/emms-player-simple.el b/emms-player-simple.el
index dd7eec9..ca1bc1c 100644
--- a/emms-player-simple.el
+++ b/emms-player-simple.el
@@ -75,7 +75,7 @@ to call the player and ARGS are the command line arguments."
(defcustom ,parameters ',args
,(concat "The arguments to `" (symbol-name command-name) "'.")
:type '(repeat string))
- (defcustom ,player-name (emms-player ',start ',stop ',playablep)
+ (defcustom ,player-name (emms-player #',start #',stop #',playablep)
,(concat "A player for EMMS.")
:type '(cons symbol alist))
(emms-player-set ,player-name 'regex ,regex)
@@ -113,14 +113,14 @@ to call the player and ARGS are the command line
arguments."
"Starts a process playing FILENAME using the specified CMDNAME with
the specified PARAMS.
PLAYER is the name of the current player."
- (let ((process (apply 'start-process
+ (let ((process (apply #'start-process
emms-player-simple-process-name
nil
cmdname
;; splice in params here
(append params (list filename)))))
;; add a sentinel for signaling termination
- (set-process-sentinel process 'emms-player-simple-sentinel))
+ (set-process-sentinel process #'emms-player-simple-sentinel))
(emms-player-started player))
(defun emms-player-simple-sentinel (proc str)
diff --git a/emms-player-vlc.el b/emms-player-vlc.el
index 35d6861..7a502cd 100644
--- a/emms-player-vlc.el
+++ b/emms-player-vlc.el
@@ -1,6 +1,6 @@
;;; emms-player-vlc.el --- vlc support for EMMS -*- lexical-binding: t; -*-
-;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2021 Free Software Foundation, Inc.
;; Authors: Yoni Rabkin <yrk@gnu.org>
@@ -52,8 +52,8 @@
(append emms-player-vlc-parameters
(list (emms-track-name (ad-get-arg 0)))
'("vlc://quit")))))
- ;; add a sentinel for signaling termination
- (set-process-sentinel process 'emms-player-simple-sentinel))
+ ;; Add a sentinel for signaling termination.
+ (set-process-sentinel process #'emms-player-simple-sentinel))
(emms-player-started emms-player-vlc))
(defun emms-player-vlc-pause ()
diff --git a/emms-playing-time.el b/emms-playing-time.el
index bca96b1..11dc9e3 100644
--- a/emms-playing-time.el
+++ b/emms-playing-time.el
@@ -86,7 +86,7 @@ and `downtime' (e.g. -03:58)."
(setq emms-playing-time 0)
(unless emms-playing-time-display-timer
(setq emms-playing-time-display-timer
- (run-at-time t 1 'emms-playing-time-display))))
+ (run-at-time t 1 #'emms-playing-time-display))))
(defun emms-playing-time-stop ()
"Remove playing time on the mode line."
@@ -104,7 +104,7 @@ and `downtime' (e.g. -03:58)."
(emms-playing-time-stop)
(unless emms-playing-time-display-timer
(setq emms-playing-time-display-timer
- (run-at-time t 1 'emms-playing-time-display)))))
+ (run-at-time t 1 #'emms-playing-time-display)))))
(defun emms-playing-time-seek (sec)
"Seek forward or backward SEC playing time."
@@ -133,22 +133,22 @@ could call `emms-playing-time-enable-display' and
(setq emms-playing-time-p t
emms-playing-time-display-p t)
(emms-playing-time-mode-line)
- (add-hook 'emms-player-started-hook 'emms-playing-time-start)
- (add-hook 'emms-player-stopped-hook 'emms-playing-time-stop)
- (add-hook 'emms-player-finished-hook 'emms-playing-time-stop)
- (add-hook 'emms-player-paused-hook 'emms-playing-time-pause)
- (add-hook 'emms-player-seeked-functions 'emms-playing-time-seek)
- (add-hook 'emms-player-time-set-functions 'emms-playing-time-set))
+ (add-hook 'emms-player-started-hook #'emms-playing-time-start)
+ (add-hook 'emms-player-stopped-hook #'emms-playing-time-stop)
+ (add-hook 'emms-player-finished-hook #'emms-playing-time-stop)
+ (add-hook 'emms-player-paused-hook #'emms-playing-time-pause)
+ (add-hook 'emms-player-seeked-functions #'emms-playing-time-seek)
+ (add-hook 'emms-player-time-set-functions #'emms-playing-time-set))
(setq emms-playing-time-p nil
emms-playing-time-display-p nil)
(emms-playing-time-stop)
(emms-playing-time-restore-mode-line)
- (remove-hook 'emms-player-started-hook 'emms-playing-time-start)
- (remove-hook 'emms-player-stopped-hook 'emms-playing-time-stop)
- (remove-hook 'emms-player-finished-hook 'emms-playing-time-stop)
- (remove-hook 'emms-player-paused-hook 'emms-playing-time-pause)
- (remove-hook 'emms-player-seeked-functions 'emms-playing-time-seek)
- (remove-hook 'emms-player-time-set-functions 'emms-playing-time-set)))
+ (remove-hook 'emms-player-started-hook #'emms-playing-time-start)
+ (remove-hook 'emms-player-stopped-hook #'emms-playing-time-stop)
+ (remove-hook 'emms-player-finished-hook #'emms-playing-time-stop)
+ (remove-hook 'emms-player-paused-hook #'emms-playing-time-pause)
+ (remove-hook 'emms-player-seeked-functions #'emms-playing-time-seek)
+ (remove-hook 'emms-player-time-set-functions #'emms-playing-time-set)))
;;;###autoload
(defun emms-playing-time-enable-display ()
diff --git a/emms-playlist-limit.el b/emms-playlist-limit.el
index 59ad0f5..ed6c8b9 100644
--- a/emms-playlist-limit.el
+++ b/emms-playlist-limit.el
@@ -130,16 +130,16 @@ If this playlist is current, make the playlist we switch
to current."
(emms-playlist-set-playlist-buffer))
(bury-buffer old-buf))))
-(define-key emms-playlist-mode-map (kbd "/ n") 'emms-playlist-limit-to-name)
-(define-key emms-playlist-mode-map (kbd "/ a")
'emms-playlist-limit-to-info-artist)
-(define-key emms-playlist-mode-map (kbd "/ c")
'emms-playlist-limit-to-info-composer)
-(define-key emms-playlist-mode-map (kbd "/ p")
'emms-playlist-limit-to-info-performer)
-(define-key emms-playlist-mode-map (kbd "/ t")
'emms-playlist-limit-to-info-title)
-(define-key emms-playlist-mode-map (kbd "/ b")
'emms-playlist-limit-to-info-album)
-(define-key emms-playlist-mode-map (kbd "/ y")
'emms-playlist-limit-to-info-year)
-(define-key emms-playlist-mode-map (kbd "/ g")
'emms-playlist-limit-to-info-genre)
-(define-key emms-playlist-mode-map (kbd "/ d")
'emms-playlist-limit-to-description)
-(define-key emms-playlist-mode-map (kbd "/ /") 'emms-playlist-limit-to-all)
+(define-key emms-playlist-mode-map (kbd "/ n") #'emms-playlist-limit-to-name)
+(define-key emms-playlist-mode-map (kbd "/ a")
#'emms-playlist-limit-to-info-artist)
+(define-key emms-playlist-mode-map (kbd "/ c")
#'emms-playlist-limit-to-info-composer)
+(define-key emms-playlist-mode-map (kbd "/ p")
#'emms-playlist-limit-to-info-performer)
+(define-key emms-playlist-mode-map (kbd "/ t")
#'emms-playlist-limit-to-info-title)
+(define-key emms-playlist-mode-map (kbd "/ b")
#'emms-playlist-limit-to-info-album)
+(define-key emms-playlist-mode-map (kbd "/ y")
#'emms-playlist-limit-to-info-year)
+(define-key emms-playlist-mode-map (kbd "/ g")
#'emms-playlist-limit-to-info-genre)
+(define-key emms-playlist-mode-map (kbd "/ d")
#'emms-playlist-limit-to-description)
+(define-key emms-playlist-mode-map (kbd "/ /") #'emms-playlist-limit-to-all)
;;; Low Level Functions
diff --git a/emms-playlist-mode.el b/emms-playlist-mode.el
index 9692f19..2815a56 100644
--- a/emms-playlist-mode.el
+++ b/emms-playlist-mode.el
@@ -110,41 +110,41 @@ This is true for every invocation of
`emms-playlist-mode-go'."
(defvar emms-playlist-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map text-mode-map)
- (define-key map (kbd "C-x C-s") 'emms-playlist-save)
- (define-key map (kbd "C-y") 'emms-playlist-mode-yank)
- (define-key map (kbd "C-k") 'emms-playlist-mode-kill-track)
- (define-key map (kbd "C-w") 'emms-playlist-mode-kill)
- (define-key map (kbd "C-_") 'emms-playlist-mode-undo)
- (define-key map (kbd "C-/") 'emms-playlist-mode-undo)
- (define-key map (kbd "C-x u") 'emms-playlist-mode-undo)
- (define-key map (kbd "C-n") 'next-line)
- (define-key map (kbd "C-p") 'previous-line)
- (define-key map (kbd "C-j") 'emms-playlist-mode-insert-newline)
- (define-key map (kbd "M-y") 'emms-playlist-mode-yank-pop)
- (define-key map (kbd "M-<") 'emms-playlist-mode-first)
- (define-key map (kbd "M->") 'emms-playlist-mode-last)
- (define-key map (kbd "M-n") 'emms-playlist-mode-next)
- (define-key map (kbd "M-p") 'emms-playlist-mode-previous)
- (define-key map (kbd "a") 'emms-playlist-mode-add-contents)
- (define-key map (kbd "b") 'emms-playlist-set-playlist-buffer)
- (define-key map (kbd "D") 'emms-playlist-mode-kill-track)
- (define-key map (kbd "n") 'emms-next)
- (define-key map (kbd "p") 'emms-previous)
- (define-key map (kbd "SPC") 'scroll-up)
- (define-key map (kbd ">") 'emms-seek-forward)
- (define-key map (kbd "<") 'emms-seek-backward)
- (define-key map (kbd "P") 'emms-pause)
- (define-key map (kbd "s") 'emms-stop)
- (define-key map (kbd "f") 'emms-show)
- (define-key map (kbd "c") 'emms-playlist-mode-center-current)
- (define-key map (kbd "q") 'emms-playlist-mode-bury-buffer)
- (define-key map (kbd "K") 'emms-playlist-mode-current-kill)
- (define-key map (kbd "?") 'describe-mode)
- (define-key map (kbd "r") 'emms-random)
- (define-key map (kbd "C") 'emms-playlist-clear)
- (define-key map (kbd "d") 'emms-playlist-mode-goto-dired-at-point)
- (define-key map (kbd "<mouse-2>") 'emms-playlist-mode-play-current-track)
- (define-key map (kbd "RET") 'emms-playlist-mode-play-smart)
+ (define-key map (kbd "C-x C-s") #'emms-playlist-save)
+ (define-key map (kbd "C-y") #'emms-playlist-mode-yank)
+ (define-key map (kbd "C-k") #'emms-playlist-mode-kill-track)
+ (define-key map (kbd "C-w") #'emms-playlist-mode-kill)
+ (define-key map (kbd "C-_") #'emms-playlist-mode-undo)
+ (define-key map (kbd "C-/") #'emms-playlist-mode-undo)
+ (define-key map (kbd "C-x u") #'emms-playlist-mode-undo)
+ (define-key map (kbd "C-n") #'next-line)
+ (define-key map (kbd "C-p") #'previous-line)
+ (define-key map (kbd "C-j") #'emms-playlist-mode-insert-newline)
+ (define-key map (kbd "M-y") #'emms-playlist-mode-yank-pop)
+ (define-key map (kbd "M-<") #'emms-playlist-mode-first)
+ (define-key map (kbd "M->") #'emms-playlist-mode-last)
+ (define-key map (kbd "M-n") #'emms-playlist-mode-next)
+ (define-key map (kbd "M-p") #'emms-playlist-mode-previous)
+ (define-key map (kbd "a") #'emms-playlist-mode-add-contents)
+ (define-key map (kbd "b") #'emms-playlist-set-playlist-buffer)
+ (define-key map (kbd "D") #'emms-playlist-mode-kill-track)
+ (define-key map (kbd "n") #'emms-next)
+ (define-key map (kbd "p") #'emms-previous)
+ (define-key map (kbd "SPC") #'scroll-up)
+ (define-key map (kbd ">") #'emms-seek-forward)
+ (define-key map (kbd "<") #'emms-seek-backward)
+ (define-key map (kbd "P") #'emms-pause)
+ (define-key map (kbd "s") #'emms-stop)
+ (define-key map (kbd "f") #'emms-show)
+ (define-key map (kbd "c") #'emms-playlist-mode-center-current)
+ (define-key map (kbd "q") #'emms-playlist-mode-bury-buffer)
+ (define-key map (kbd "K") #'emms-playlist-mode-current-kill)
+ (define-key map (kbd "?") #'describe-mode)
+ (define-key map (kbd "r") #'emms-random)
+ (define-key map (kbd "C") #'emms-playlist-clear)
+ (define-key map (kbd "d") #'emms-playlist-mode-goto-dired-at-point)
+ (define-key map (kbd "<mouse-2>") #'emms-playlist-mode-play-current-track)
+ (define-key map (kbd "RET") #'emms-playlist-mode-play-smart)
map)
"Keymap for `emms-playlist-mode'.")
@@ -594,11 +594,11 @@ WINDOW-WIDTH should be a positive integer."
mode-name "EMMS")
(setq emms-playlist-insert-track-function
- 'emms-playlist-mode-insert-track)
+ #'emms-playlist-mode-insert-track)
(setq emms-playlist-update-track-function
- 'emms-playlist-mode-update-track-function)
+ #'emms-playlist-mode-update-track-function)
(add-hook 'emms-playlist-selection-changed-hook
- 'emms-playlist-mode-overlay-selected)
+ #'emms-playlist-mode-overlay-selected)
(emms-playlist-mode-startup)
diff --git a/emms-playlist-sort.el b/emms-playlist-sort.el
index cfab320..17f342c 100644
--- a/emms-playlist-sort.el
+++ b/emms-playlist-sort.el
@@ -136,21 +136,21 @@ With a prefix argument, oldest first."
"Setup sort map with latest `emms-playlist-sort-prefix'."
(setq emms-playlist-sort-map
(let ((map (make-sparse-keymap)))
- (define-key map (kbd "n") 'emms-playlist-sort-by-natural-order)
- (define-key map (kbd "a") 'emms-playlist-sort-by-info-artist)
- (define-key map (kbd "c") 'emms-playlist-sort-by-play-count)
- (define-key map (kbd "b") 'emms-playlist-sort-by-info-album)
- (define-key map (kbd "l") 'emms-playlist-sort-by-last-played)
- (define-key map (kbd "t") 'emms-playlist-sort-by-info-title)
- (define-key map (kbd "e") 'emms-playlist-sort-by-file-extension)
-
- (define-key map (kbd "p") 'emms-playlist-sort-by-info-performer)
- (define-key map (kbd "y") 'emms-playlist-sort-by-info-year)
- (define-key map (kbd "o") 'emms-playlist-sort-by-info-note)
- (define-key map (kbd "C") 'emms-playlist-sort-by-info-composer)
- (define-key map (kbd "L") 'emms-playlist-sort-by-list)
- (define-key map (kbd "N") 'emms-playlist-sort-by-name)
- (define-key map (kbd "T") 'emms-playlist-sort-by-file-mtime)
+ (define-key map (kbd "n") #'emms-playlist-sort-by-natural-order)
+ (define-key map (kbd "a") #'emms-playlist-sort-by-info-artist)
+ (define-key map (kbd "c") #'emms-playlist-sort-by-play-count)
+ (define-key map (kbd "b") #'emms-playlist-sort-by-info-album)
+ (define-key map (kbd "l") #'emms-playlist-sort-by-last-played)
+ (define-key map (kbd "t") #'emms-playlist-sort-by-info-title)
+ (define-key map (kbd "e") #'emms-playlist-sort-by-file-extension)
+
+ (define-key map (kbd "p") #'emms-playlist-sort-by-info-performer)
+ (define-key map (kbd "y") #'emms-playlist-sort-by-info-year)
+ (define-key map (kbd "o") #'emms-playlist-sort-by-info-note)
+ (define-key map (kbd "C") #'emms-playlist-sort-by-info-composer)
+ (define-key map (kbd "L") #'emms-playlist-sort-by-list)
+ (define-key map (kbd "N") #'emms-playlist-sort-by-name)
+ (define-key map (kbd "T") #'emms-playlist-sort-by-file-mtime)
map))
(define-key emms-playlist-mode-map
@@ -171,7 +171,7 @@ With a prefix argument, oldest first."
(point-min) (point-max)))))
(delete-region (point-min) (point-max))
(run-hooks 'emms-playlist-cleared-hook)
- (mapc 'emms-playlist-insert-track (sort tracks predicate))
+ (mapc #'emms-playlist-insert-track (sort tracks predicate))
(let ((pos (when current (text-property-any (point-min) (point-max)
'emms-track current))))
(if pos
diff --git a/emms-score.el b/emms-score.el
index 1537322..e9fb530 100644
--- a/emms-score.el
+++ b/emms-score.el
@@ -1,7 +1,6 @@
;;; emms-score.el --- Scoring system for mp3player -*- lexical-binding: t; -*-
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Authors: Jean-Philippe Theberge <jphiltheberge@videotron.ca>,
;; Yoni Rabkin <yrk@gnu.org>
@@ -88,13 +87,13 @@ off otherwise."
(progn
(setq emms-score-enabled-p t)
(emms-score-load-hash)
- (setq emms-ok-track-function 'emms-score-ok-track-function)
+ (setq emms-ok-track-function #'emms-score-ok-track-function)
(unless noninteractive
- (add-hook 'kill-emacs-hook 'emms-score-save-hash)))
+ (add-hook 'kill-emacs-hook #'emms-score-save-hash)))
(setq emms-score-enabled-p nil)
(emms-score-save-hash)
- (setq emms-ok-track-function 'emms-default-ok-track-function)
- (remove-hook 'kill-emacs-hook 'emms-score-save-hash)))
+ (setq emms-ok-track-function #'emms-default-ok-track-function)
+ (remove-hook 'kill-emacs-hook #'emms-score-save-hash)))
;;;###autoload
(defun emms-score-enable ()
diff --git a/emms-setup.el b/emms-setup.el
index 60ebe38..67d0aa0 100644
--- a/emms-setup.el
+++ b/emms-setup.el
@@ -112,17 +112,17 @@ the stable features which come with the Emms
distribution."
(require 'emms-librefm-scrobbler)
(require 'emms-librefm-stream))
;; setup
- (setq emms-playlist-default-major-mode 'emms-playlist-mode)
- (add-to-list 'emms-track-initialize-functions 'emms-info-initialize-track)
+ (setq emms-playlist-default-major-mode #'emms-playlist-mode)
+ (add-to-list 'emms-track-initialize-functions #'emms-info-initialize-track)
(setq emms-info-functions '(emms-info-native emms-info-cueinfo))
- (setq emms-track-description-function 'emms-info-track-description)
+ (setq emms-track-description-function #'emms-info-track-description)
(when (fboundp 'emms-cache) ; work around compiler warning
(emms-cache 1))
(emms-mode-line 1)
(emms-mode-line-blank)
(emms-lyrics 1)
(emms-playing-time 1)
- (add-hook 'emms-player-started-hook 'emms-last-played-update-current)
+ (add-hook 'emms-player-started-hook #'emms-last-played-update-current)
(emms-score 1))
diff --git a/emms-show-all.el b/emms-show-all.el
index fa7181d..b08e5bd 100644
--- a/emms-show-all.el
+++ b/emms-show-all.el
@@ -1,6 +1,6 @@
;;; emms-show-all.el --- Detailed track information for Emms. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; Author: Yoni Rabkin <yrk@gnu.org>
@@ -21,10 +21,10 @@
;; Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
;;; Commentary:
-;;;
-;;; Shows all of the available information Emms can provide on the
-;;; currently playing track. Based on an idea suggested on the
-;;; emms-help mailing list by Ivan Truskov.
+;;
+;; Shows all of the available information Emms can provide on the
+;; currently playing track. Based on an idea suggested on the
+;; emms-help mailing list by Ivan Truskov.
;;; Code:
@@ -44,8 +44,8 @@
(defvar emms-show-all-mode-map
(let ((map (make-sparse-keymap)))
(set-keymap-parent map text-mode-map)
- (define-key map (kbd "q") 'emms-show-all-mode-bury-buffer)
- (define-key map (kbd "E") 'emms-show-all-edit-track)
+ (define-key map (kbd "q") #'emms-show-all-mode-bury-buffer)
+ (define-key map (kbd "E") #'emms-show-all-edit-track)
map)
"Keymap for `emms-show-all-mode'.")
diff --git a/emms-source-file.el b/emms-source-file.el
index 9060528..9678b41 100644
--- a/emms-source-file.el
+++ b/emms-source-file.el
@@ -199,7 +199,7 @@ This function uses
`emms-source-file-directory-tree-function'."
(let ((pl (sort (funcall emms-source-file-directory-tree-function
dir
regex)
- 'string<)))
+ #'string<)))
(message "Building playlist...done")
pl))
diff --git a/emms-tag-editor.el b/emms-tag-editor.el
index 52a8046..d0028d2 100644
--- a/emms-tag-editor.el
+++ b/emms-tag-editor.el
@@ -80,7 +80,7 @@
"\n\n"))
(defvar emms-tag-editor-formats
- (let* ((tags (mapcar 'car emms-tag-editor-tags))
+ (let* ((tags (mapcar #'car emms-tag-editor-tags))
(default (emms-tag-editor-make-format (remove 'info-date tags))))
`(("mp3" . ,default)
("ogg" . ,(emms-tag-editor-make-format (remove 'info-year tags)))
@@ -201,7 +201,7 @@ Valid tags are given by
`emms-tag-editor-tagfile-functions'."
(if (and val (stringp val))
(setq args (append (list (cdr tag) val) args))))
tags)
- (apply 'call-process program
+ (apply #'call-process program
nil (get-buffer-create emms-tag-editor-log-buffer) nil
(nconc args (list filename)))))
@@ -222,12 +222,12 @@ This string is suitable for inserting into the tags
buffer."
(funcall format track)
(format-spec
format
- (apply 'format-spec-make
+ (apply #'format-spec-make
?m (emms-propertize (emms-track-force-description track)
'face 'emms-playlist-track-face
'emms-track (copy-sequence track))
?f (emms-track-name track)
- (apply 'append
+ (apply #'append
(mapcar (lambda (tag)
(list (string-to-char (cdr tag))
(or (emms-track-get track (car tag)) "")))
@@ -265,7 +265,7 @@ This string is suitable for inserting into the tags buffer."
(emms-tag-editor-erase-buffer emms-tag-editor-log-buffer)
(emms-tag-editor-erase-buffer emms-tag-editor-edit-buffer)
(set-buffer (get-buffer emms-tag-editor-edit-buffer))
- (mapc 'emms-tag-editor-insert-track tracks)
+ (mapc #'emms-tag-editor-insert-track tracks)
(emms-tag-editor-mode)
(pop-to-buffer (current-buffer))
(goto-char (point-min))
@@ -295,19 +295,19 @@ This string is suitable for inserting into the tags
buffer."
(defvar emms-tag-editor-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map [tab] 'emms-tag-editor-next-field)
- (define-key map [backtab] 'emms-tag-editor-prev-field)
- (define-key map "\C-c\C-n" 'emms-tag-editor-next-track)
- (define-key map "\C-c\C-p" 'emms-tag-editor-prev-track)
- (define-key map "\C-c\C-c" 'emms-tag-editor-submit-and-exit)
- (define-key map "\C-c\C-s" 'emms-tag-editor-submit)
- (define-key map "\C-x\C-s" 'emms-tag-editor-submit)
- (define-key map "\C-c\C-r" 'emms-tag-editor-set-all)
- (define-key map "\C-c\C-a" 'emms-tag-editor-replace-in-tag)
- (define-key map "\C-c\C-t" 'emms-tag-editor-transpose-tag)
+ (define-key map [tab] #'emms-tag-editor-next-field)
+ (define-key map [backtab] #'emms-tag-editor-prev-field)
+ (define-key map "\C-c\C-n" #'emms-tag-editor-next-track)
+ (define-key map "\C-c\C-p" #'emms-tag-editor-prev-track)
+ (define-key map "\C-c\C-c" #'emms-tag-editor-submit-and-exit)
+ (define-key map "\C-c\C-s" #'emms-tag-editor-submit)
+ (define-key map "\C-x\C-s" #'emms-tag-editor-submit)
+ (define-key map "\C-c\C-r" #'emms-tag-editor-set-all)
+ (define-key map "\C-c\C-a" #'emms-tag-editor-replace-in-tag)
+ (define-key map "\C-c\C-t" #'emms-tag-editor-transpose-tag)
map)
"Keymap for `emms-tag-editor-mode'.")
-(define-key emms-playlist-mode-map "E" 'emms-tag-editor-edit)
+(define-key emms-playlist-mode-map "E" #'emms-tag-editor-edit)
(define-derived-mode emms-tag-editor-mode text-mode "Tag-Edit"
"Major mode to edit track tags.
@@ -725,7 +725,7 @@ With prefix argument, bury the tag edit buffer."
(defun emms-tag-editor-log (&rest args)
(with-current-buffer (get-buffer-create emms-tag-editor-log-buffer)
(goto-char (point-max))
- (insert (apply 'format args) "\n")))
+ (insert (apply #'format args) "\n")))
;;
;; Renaming files according their tags
@@ -762,8 +762,8 @@ Then it's the callers job to apply them afterwards with
path
(format-spec
emms-tag-editor-rename-format
- (apply 'format-spec-make
- (apply 'append
+ (apply #'format-spec-make
+ (apply #'append
(mapcar
(lambda (tag)
(list (string-to-char (cdr tag))
@@ -788,7 +788,7 @@ Then it's the callers job to apply them afterwards with
(emms-tag-editor-rename-track track t))
(emms-tag-editor-apply tracks))))
-(define-key emms-playlist-mode-map "R" 'emms-tag-editor-rename)
+(define-key emms-playlist-mode-map "R" #'emms-tag-editor-rename)
(defvar emms-tag-editor-pipe-config
'(("mid3iconv -e gbk <file>"
diff --git a/emms-volume-pulse.el b/emms-volume-pulse.el
index 10b8889..5211e69 100644
--- a/emms-volume-pulse.el
+++ b/emms-volume-pulse.el
@@ -1,6 +1,6 @@
;;; emms-volume-pulse.el --- a mode for changing volume using PulseAudio pactl
-*- lexical-binding: t; -*-
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
;; Author: Rasmus Pank Roulund <emacs@pank.eu>
@@ -73,12 +73,12 @@ See full list of devices on your system by running
(car
(reverse
(funcall
- (if sink-number-p 'assq 'assoc)
+ (if sink-number-p #'assq #'assoc)
emms-volume-pulse-sink
(mapcar (if sink-number-p 'identity 'cdr)
(cl-loop while
(string-match
- (mapconcat 'identity
+ (mapconcat #'identity
'(".*Sink[ \t]+\\#\\([0-9]+\\)"
".*Name:[ \t]\\([^\n]+\\)"
".*Volume:.*?\\([0-9]+\\)%.*\n?")
diff --git a/emms-volume.el b/emms-volume.el
index 98b99ee..bb92a31 100644
--- a/emms-volume.el
+++ b/emms-volume.el
@@ -92,8 +92,8 @@ This should be a positive integer."
(interactive)
(funcall emms-volume-change-function (- emms-volume-change-amount)))
-(define-key emms-playlist-mode-map (kbd "+") 'emms-volume-raise)
-(define-key emms-playlist-mode-map (kbd "-") 'emms-volume-lower)
+(define-key emms-playlist-mode-map (kbd "+") #'emms-volume-raise)
+(define-key emms-playlist-mode-map (kbd "-") #'emms-volume-lower)
;; Code specific to the minor mode.
(define-minor-mode emms-volume-minor-mode
@@ -135,7 +135,7 @@ This should be a positive integer."
(emms-volume-mode-disable-timer))
(setq emms-volume-mode-timer (run-at-time emms-volume-mode-timeout
nil
- 'emms-volume-mode-timer-timeout)))
+ #'emms-volume-mode-timer-timeout)))
(defun emms-volume-mode-timer-timeout ()
"Function to disable `emms-volume-minor-mode' at timeout."
diff --git a/emms.el b/emms.el
index 499204e..d2c9662 100644
--- a/emms.el
+++ b/emms.el
@@ -1,7 +1,6 @@
;;; emms.el --- The Emacs Multimedia System -*- lexical-binding: t; -*-
-;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
-;; 2009, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2021 Free Software Foundation, Inc.
;; Author: Jorgen Schäfer <forcer@forcix.cx>, the Emms developers (see AUTHORS
file)
;; Maintainer: Yoni Rabkin <yrk@gnu.org>
@@ -537,9 +536,9 @@ See `emms-random-playlist'."
(interactive)
(setq emms-random-playlist (not emms-random-playlist))
(if emms-random-playlist
- (progn (setq emms-player-next-function 'emms-random)
+ (progn (setq emms-player-next-function #'emms-random)
(message "Will play the tracks randomly."))
- (setq emms-player-next-function 'emms-next-noerror)
+ (setq emms-player-next-function #'emms-next-noerror)
(message "Will play the tracks sequentially.")))
(defun emms-toggle-repeat-playlist ()
@@ -1117,7 +1116,7 @@ This uses `emms-playlist-update-track-function'."
"Insert tracks from SOURCE in the current playlist.
This is supplying ARGS as arguments to the source."
(with-current-emms-playlist
- (apply 'emms-playlist-insert-source source args)))
+ (apply #'emms-playlist-insert-source source args)))
(defun emms-playlist-tracks-in-region (beg end)
"Return all tracks between BEG and END."
@@ -1213,7 +1212,7 @@ ignore this."
(delete-region (point-min)
(point-max))
(run-hooks 'emms-playlist-cleared-hook)
- (mapc 'emms-playlist-insert-track
+ (mapc #'emms-playlist-insert-track
(sort tracks emms-sort-lessp-function))
(let ((pos (text-property-any (point-min)
(point-max)
@@ -1249,7 +1248,7 @@ ignore this."
(point-max))))
(delete-region (point-min) (point-max))
(run-hooks 'emms-playlist-cleared-hook)
- (mapc 'emms-playlist-insert-track
+ (mapc #'emms-playlist-insert-track
(nreverse
(emms-uniq-list tracks 'emms-track-name)))
(let ((pos (text-property-any (point-min)
@@ -1357,7 +1356,7 @@ See emms-source-file.el for some examples."
"Play the tracks of SOURCE, after first clearing the EMMS playlist."
(emms-stop)
(emms-playlist-current-clear)
- (apply 'emms-playlist-current-insert-source source args)
+ (apply #'emms-playlist-current-insert-source source args)
(emms-playlist-current-select-first)
(emms-start))
@@ -1366,7 +1365,7 @@ See emms-source-file.el for some examples."
(with-current-emms-playlist
(save-excursion
(goto-char (point-max))
- (apply 'emms-playlist-current-insert-source source args))
+ (apply #'emms-playlist-current-insert-source source args))
(when (or (not emms-playlist-selected-marker)
(not (marker-position emms-playlist-selected-marker)))
(emms-playlist-select-first))))
@@ -1375,7 +1374,7 @@ See emms-source-file.el for some examples."
"Insert the tracks from SOURCE in the current buffer."
(if (not emms-playlist-buffer-p)
(error "Not in an EMMS playlist buffer")
- (apply 'emms-playlist-insert-source source args)))
+ (apply #'emms-playlist-insert-source source args)))
;;; User-defined playlists
;;; FIXME: Shuffle is bogus here! (because of narrowing)
diff --git a/jack.el b/jack.el
index ffee3b1..4d17526 100644
--- a/jack.el
+++ b/jack.el
@@ -96,7 +96,7 @@ to nil, use the Emacs variables to build the startup args."
First element is the executable path."
(or (and jack-use-jack-rc
(catch 'rc-found
- (let ((files (mapcar 'expand-file-name jack-rc)))
+ (let ((files (mapcar #'expand-file-name jack-rc)))
(while files
(if (file-exists-p (car files))
(with-temp-buffer
@@ -146,7 +146,7 @@ is given in jackd command-line."
mode-line-format (copy-tree mode-line-format))
(setcar (nthcdr 16 mode-line-format)
`(:eval (format "load:%.2f" jack-load)))
- (add-hook 'kill-buffer-hook 'jack-kill nil t)
+ (add-hook 'kill-buffer-hook #'jack-kill nil t)
(current-buffer))))
(defvar jack-xruns nil)
@@ -180,7 +180,7 @@ is given in jackd command-line."
(interactive)
(if (jack-running-p) (error "JACK already running")
(setq jack-process
- (apply 'start-process "jack" (jack-output-buffer)
+ (apply #'start-process "jack" (jack-output-buffer)
(jack-maybe-rtlimits (jack-args))))
(set-process-filter jack-process #'jack-filter)
(run-hooks 'jack-started-hook)
@@ -253,7 +253,7 @@ is given in jackd command-line."
(defun jack-unique-port-name (strings)
(let ((start "")
- (maxlen (apply 'min (mapcar #'length strings))))
+ (maxlen (apply #'min (mapcar #'length strings))))
(while (and (< (length start) maxlen)
(catch 'not-ok
(let ((nextchar (substring (car strings) (length start) (1+
(length start)))))
@@ -270,7 +270,8 @@ is given in jackd command-line."
(emms-remove-if-not predicate (jack-ports program))
(jack-ports program))))
(if (< (length ports) 2) (caar ports)
- (completing-read prompt ports nil t (jack-unique-port-name (mapcar 'car
ports))))))
+ (completing-read prompt ports nil t
+ (jack-unique-port-name (mapcar #'car ports))))))
(defun jack-connect (from-program from-port to-program to-port)
"Connect FROM-PROGRAM's output port FROM-PORT to TO-PROGRAM's input port