diff options
| author | Stefan Monnier | 2015-10-16 09:56:05 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2015-10-16 09:56:05 -0400 |
| commit | ce47ac81f6aaa347942fb7f7173b349bd1a231c1 (patch) | |
| tree | cae341589b9b5f40742e7aac3dde75b9f3f4cdfa | |
| parent | 1158df5f677c1c9ac8649910a680c17b53452753 (diff) | |
| download | emacs-ce47ac81f6aaa347942fb7f7173b349bd1a231c1.tar.gz emacs-ce47ac81f6aaa347942fb7f7173b349bd1a231c1.zip | |
* lisp/mpc.el: Rename the new toggling commands
(mpc-toggle-consume, mpc-toggle-repeat, mpc-toggle-single)
(mpc-toggle-shuffle): Add "-toggle" in the name.
| -rw-r--r-- | lisp/mpc.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/mpc.el b/lisp/mpc.el index 8cbea4fbbbf..af1aac93f14 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el | |||
| @@ -1134,17 +1134,17 @@ If PLAYLIST is t or nil or missing, use the main playlist." | |||
| 1134 | (easy-menu-define mpc-mode-menu mpc-mode-map | 1134 | (easy-menu-define mpc-mode-menu mpc-mode-map |
| 1135 | "Menu for MPC.el." | 1135 | "Menu for MPC.el." |
| 1136 | '("MPC.el" | 1136 | '("MPC.el" |
| 1137 | ["Play/Pause" mpc-toggle-play] | 1137 | ["Play/Pause" mpc-toggle-play] ;FIXME: Add one of ⏯/▶/⏸ in there? |
| 1138 | ["Next Track" mpc-next] | 1138 | ["Next Track" mpc-next] ;FIXME: Add ⇥ there? |
| 1139 | ["Previous Track" mpc-prev] | 1139 | ["Previous Track" mpc-prev] ;FIXME: Add ⇤ there? |
| 1140 | "--" | 1140 | "--" |
| 1141 | ["Repeat Playlist" mpc-repeat :style toggle | 1141 | ["Repeat Playlist" mpc-toggle-repeat :style toggle |
| 1142 | :selected (member '(repeat . "1") mpc-status)] | 1142 | :selected (member '(repeat . "1") mpc-status)] |
| 1143 | ["Shuffle Playlist" mpc-shuffle :style toggle | 1143 | ["Shuffle Playlist" mpc-toggle-shuffle :style toggle |
| 1144 | :selected (member '(random . "1") mpc-status)] | 1144 | :selected (member '(random . "1") mpc-status)] |
| 1145 | ["Repeat Single Track" mpc-single :style toggle | 1145 | ["Repeat Single Track" mpc-toggle-single :style toggle |
| 1146 | :selected (member '(single . "1") mpc-status)] | 1146 | :selected (member '(single . "1") mpc-status)] |
| 1147 | ["Consume Mode" mpc-consume :style toggle | 1147 | ["Consume Mode" mpc-toggle-consume :style toggle |
| 1148 | :selected (member '(consume . "1") mpc-status)] | 1148 | :selected (member '(consume . "1") mpc-status)] |
| 1149 | "--" | 1149 | "--" |
| 1150 | ["Add new browser" mpc-tagbrowser] | 1150 | ["Add new browser" mpc-tagbrowser] |
| @@ -2362,25 +2362,25 @@ This is used so that they can be compared with `eq', which is needed for | |||
| 2362 | (mpc-status-stop) | 2362 | (mpc-status-stop) |
| 2363 | (if proc (delete-process proc)))) | 2363 | (if proc (delete-process proc)))) |
| 2364 | 2364 | ||
| 2365 | (defun mpc-consume () | 2365 | (defun mpc-toggle-consume () |
| 2366 | "Toggle consume mode: removing played songs from the playlist." | 2366 | "Toggle consume mode: removing played songs from the playlist." |
| 2367 | (interactive) | 2367 | (interactive) |
| 2368 | (mpc-cmd-consume | 2368 | (mpc-cmd-consume |
| 2369 | (if (string= "0" (cdr (assq 'consume (mpc-cmd-status)))) "1" "0"))) | 2369 | (if (string= "0" (cdr (assq 'consume (mpc-cmd-status)))) "1" "0"))) |
| 2370 | 2370 | ||
| 2371 | (defun mpc-repeat () | 2371 | (defun mpc-toggle-repeat () |
| 2372 | "Toggle repeat mode." | 2372 | "Toggle repeat mode." |
| 2373 | (interactive) | 2373 | (interactive) |
| 2374 | (mpc-cmd-repeat | 2374 | (mpc-cmd-repeat |
| 2375 | (if (string= "0" (cdr (assq 'repeat (mpc-cmd-status)))) "1" "0"))) | 2375 | (if (string= "0" (cdr (assq 'repeat (mpc-cmd-status)))) "1" "0"))) |
| 2376 | 2376 | ||
| 2377 | (defun mpc-single () | 2377 | (defun mpc-toggle-single () |
| 2378 | "Toggle single mode." | 2378 | "Toggle single mode." |
| 2379 | (interactive) | 2379 | (interactive) |
| 2380 | (mpc-cmd-single | 2380 | (mpc-cmd-single |
| 2381 | (if (string= "0" (cdr (assq 'single (mpc-cmd-status)))) "1" "0"))) | 2381 | (if (string= "0" (cdr (assq 'single (mpc-cmd-status)))) "1" "0"))) |
| 2382 | 2382 | ||
| 2383 | (defun mpc-shuffle () | 2383 | (defun mpc-toggle-shuffle () |
| 2384 | "Toggle shuffling of the playlist (random mode)." | 2384 | "Toggle shuffling of the playlist (random mode)." |
| 2385 | (interactive) | 2385 | (interactive) |
| 2386 | (mpc-cmd-random | 2386 | (mpc-cmd-random |