feat(music): move single to 1, save to s, drop the stop key

In the playlist buffer, single-track mode moves off s onto 1 and save moves off v onto s. The stop key (S) is gone, since SPC/pause already covers stopping. The Mode/Keys header legend follows, and v is now unbound. Stop is still reachable from the global music prefix (C-; m s).

3 files changed, 28 insertions, 11 deletions

diff --git a/modules/music-config.el b/modules/music-config.el
index d33c8c45..a7ec62c8 100644
--- a/modules/music-config.el
+++ b/modules/music-config.el
@@ -1377,12 +1377,12 @@ The rule uses a resize-safe :align-to span, not a hardcoded character count."
      (propertize "Mode    " 'face 'cj/music-header-face)
      (propertize " : " 'face 'cj/music-header-face)
      (funcall mode-indicator "r" "repeat" (bound-and-true-p emms-repeat-playlist)) "  "
-     (funcall mode-indicator "s" "single" (bound-and-true-p emms-repeat-track)) "  "
+     (funcall mode-indicator "1" "single" (bound-and-true-p emms-repeat-track)) "  "
      (funcall mode-indicator "z" "random" (bound-and-true-p emms-random-playlist)) "  "
      (funcall mode-indicator "x" "consume" cj/music-consume-mode) "\n"
      (propertize "Keys    " 'face 'cj/music-header-face)
      (propertize " : " 'face 'cj/music-header-face)
-     (propertize "a:add  c:clear  L:load  v:save  D:delete  S:stop  SPC:pause  <>:skip  ↑↓:move  C-↑↓:reorder  q:dismiss"
+     (propertize "a:add  c:clear  L:load  s:save  D:delete  SPC:pause  <>:skip  ↑↓:move  C-↑↓:reorder  q:dismiss"
                  'face 'cj/music-keyhint-face) "\n"
      (propertize "Radio   " 'face 'cj/music-header-face)
      (propertize " : " 'face 'cj/music-header-face)
@@ -1614,7 +1614,6 @@ unless fancy."
         ;; Playback
         ("p"   . emms-playlist-mode-go)
         ("SPC" . emms-pause)
-        ("s"   . emms-stop)
         ("n"   . cj/music-next)
         (">"   . cj/music-next)
         ("P"   . cj/music-previous)
@@ -1640,7 +1639,6 @@ unless fancy."
         ("D" . cj/music-delete-playlist)
         ("E" . cj/music-playlist-edit)
         ("g" . cj/music-playlist-reload)
-        ("v" . cj/music-playlist-save)
         ;; Track reordering
         ("S-<up>"   . emms-playlist-mode-shift-track-up)
         ("S-<down>" . emms-playlist-mode-shift-track-down)
@@ -2094,14 +2092,15 @@ when there is nothing to fetch."
   (message "Cleared music art cache: %s" cj/music-art-cache-dir))
 
 ;; Radio row in the playlist buffer: n = search by name, t = search by tag,
-;; m = enter a station by hand.  This moves the "single" mode toggle off t to s
-;; and emms-stop off s to S (see the header's Mode/Keys/Radio rows).
+;; m = enter a station by hand.  Single-track mode is on 1 and s saves the
+;; playlist; stop was dropped (SPC/pause covers it).  These run after
+;; use-package's :map, so they win (see the header's Mode/Keys/Radio rows).
 (with-eval-after-load 'emms
   (keymap-set emms-playlist-mode-map "n" #'cj/music-radio-search-by-name)
   (keymap-set emms-playlist-mode-map "t" #'cj/music-radio-search-by-tag)
   (keymap-set emms-playlist-mode-map "m" #'cj/music-create-radio-station)
-  (keymap-set emms-playlist-mode-map "s" #'emms-toggle-repeat-track)
-  (keymap-set emms-playlist-mode-map "S" #'emms-stop))
+  (keymap-set emms-playlist-mode-map "1" #'emms-toggle-repeat-track)
+  (keymap-set emms-playlist-mode-map "s" #'cj/music-playlist-save))
 
 (provide 'music-config)
 ;;; music-config.el ends here
diff --git a/tests/test-music-config--header-text.el b/tests/test-music-config--header-text.el
index 8de97350..c860c6d4 100644
--- a/tests/test-music-config--header-text.el
+++ b/tests/test-music-config--header-text.el
@@ -139,6 +139,23 @@
           (should (string-match-p "consume" plain))))
     (test-header--teardown)))
 
+(ert-deftest test-music-config--header-text-boundary-key-hints-single-save-stop ()
+  "Header key hints: single is on 1, save is on s, and stop (S) is gone.
+SPC/pause covers stop, so the S:stop hint and the [s] single / v:save hints
+are retired."
+  (unwind-protect
+      (progn
+        (test-header--setup-playlist-buffer '("/music/a.mp3"))
+        (let* ((header (with-current-buffer cj/music-playlist-buffer-name
+                         (cj/music--header-text)))
+               (plain (test-header--strip-properties header)))
+          (should (string-match-p "\\[1\\] single" plain))
+          (should (string-match-p "s:save" plain))
+          (should-not (string-match-p "\\[s\\] single" plain))
+          (should-not (string-match-p "v:save" plain))
+          (should-not (string-match-p "S:stop" plain))))
+    (test-header--teardown)))
+
 ;;; Error Cases
 
 (ert-deftest test-music-config--header-text-error-empty-playlist-shows-zero-count ()
diff --git a/tests/test-music-config-create-radio-station.el b/tests/test-music-config-create-radio-station.el
index 7d9adbed..4f49f49b 100644
--- a/tests/test-music-config-create-radio-station.el
+++ b/tests/test-music-config-create-radio-station.el
@@ -106,15 +106,16 @@
 
 (ert-deftest test-music-config-menu-map-lowercase-keys ()
   "Normal: the menu's former uppercase keys live on lowercase homes, and the
-playlist buffer saves on v."
+playlist buffer saves on s (single on 1, old save key v unbound)."
   (should (eq (lookup-key cj/music-map "v") 'cj/music-playlist-show))
   (should (eq (lookup-key cj/music-map "u") 'emms-shuffle))
   (should (eq (lookup-key cj/music-map "l") 'emms-toggle-repeat-playlist))
   (should-not (lookup-key cj/music-map "R"))
   (should-not (lookup-key cj/music-map "M"))
   (should-not (lookup-key cj/music-map "Z"))
-  (should (eq (lookup-key emms-playlist-mode-map "v") 'cj/music-playlist-save))
-  (should-not (eq (lookup-key emms-playlist-mode-map "w") 'cj/music-playlist-save)))
+  (should (eq (lookup-key emms-playlist-mode-map "s") 'cj/music-playlist-save))
+  (should (eq (lookup-key emms-playlist-mode-map "1") 'emms-toggle-repeat-track))
+  (should-not (lookup-key emms-playlist-mode-map "v")))
 
 ;;; Error Cases