[Emms-patches] darcs patch: emms-playlist-limit.el: (define-emms-pla... (and 4 more)

[William Xu]

Tue Jul 17 16:25:36 CST 2007  William Xu <address@hidden>
  * emms-playlist-limit.el: (define-emms-playlist-limit) Fix prompt string bug.

Tue Jul 17 17:54:54 CST 2007  William Xu <address@hidden>
  * emms-playlist-sort.el: Remove emms-playlist-sort-prefix to make the
  codes more clean. And steal "s" prefix key from
  `emms-playlist-mode'. (An alternative for emms-playlist-mode could be
  "v", same as XMMS)

Tue Jul 17 18:09:46 CST 2007  William Xu <address@hidden>
  * emms-lyrics.el: Set default value for emms-lyrics-dir to ~/music/lyrics.

Tue Jul 17 21:15:38 CST 2007  William Xu <address@hidden>
  * emms-setup.el: Enable emms-score in emms-devel.

Thu Jul 19 14:50:03 CST 2007  William Xu <address@hidden>
  * emms-playlist-sort.el: Bind "s s" to emms-playlist-sort-by-score.

New patches:

[emms-playlist-limit.el: (define-emms-playlist-limit) Fix prompt string bug.
William Xu <address@hidden>**20070717082536] {
hunk ./emms-playlist-limit.el 50
+              (attr-name ,(emms-replace-regexp-in-string
+                           "info-" "" (symbol-name attribute)))
hunk ./emms-playlist-limit.el 53
-                       (format "Limit to artist (regexp = %s): " curr)
-                     (format "Limit to artist (regexp): "))))
+                       (format "Limit to %s (regexp = %s): " attr-name curr)
+                     (format "Limit to %s (regexp): " attr-name))))
}

[emms-playlist-sort.el: Remove emms-playlist-sort-prefix to make the
William Xu <address@hidden>**20070717095454
 codes more clean. And steal "s" prefix key from
 `emms-playlist-mode'. (An alternative for emms-playlist-mode could be
 "v", same as XMMS)
] {
hunk ./emms-playlist-sort.el 36
-;; FIXME, Should better avoid relying on setting before loading
-(defcustom emms-playlist-sort-prefix "S"
-  "Prefix key sequence for `emms-playlist-sort-map'.
-If you want to customize it, you must set this variable before
-loading `emms-playlist-sort'."
-  :type 'string
-  :group 'emms-playlist-sort)
-
hunk ./emms-playlist-sort.el 85
-(defvar emms-playlist-sort-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "n") 'emms-playlist-sort-by-name)
-    (define-key map (kbd "a") 'emms-playlist-sort-by-info-artist)
-    (define-key map (kbd "t") 'emms-playlist-sort-by-info-title)
-    (define-key map (kbd "b") 'emms-playlist-sort-by-info-album)
-    (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 "N") 'emms-playlist-sort-by-natural-order)
-    (define-key map (kbd "l") 'emms-playlist-sort-by-list)
-    map))
+(eval-after-load 'emms-playlist-mode
+  '(progn
+     ;; Steal this key from emms-playlist-mode..
+     (define-key emms-playlist-mode-map (kbd "s") nil)
hunk ./emms-playlist-sort.el 90
-(eval-after-load "emms-playlist-mode"
-  '(and (boundp 'emms-playlist-mode-map)
-        (define-key emms-playlist-mode-map
-          emms-playlist-sort-prefix
-          emms-playlist-sort-map)))
+     (define-key emms-playlist-mode-map (kbd "s n") 
'emms-playlist-sort-by-name)
+     (define-key emms-playlist-mode-map (kbd "s a") 
'emms-playlist-sort-by-info-artist)
+     (define-key emms-playlist-mode-map (kbd "s t") 
'emms-playlist-sort-by-info-title)
+     (define-key emms-playlist-mode-map (kbd "s b") 
'emms-playlist-sort-by-info-album)
+     (define-key emms-playlist-mode-map (kbd "s y") 
'emms-playlist-sort-by-info-year)
+     (define-key emms-playlist-mode-map (kbd "s o") 
'emms-playlist-sort-by-info-note)
+     (define-key emms-playlist-mode-map (kbd "s N") 
'emms-playlist-sort-by-natural-order)
+     (define-key emms-playlist-mode-map (kbd "s l") 
'emms-playlist-sort-by-list)))
}

[emms-lyrics.el: Set default value for emms-lyrics-dir to ~/music/lyrics.
William Xu <address@hidden>**20070717100946] {
hunk ./emms-lyrics.el 85
-(defcustom emms-lyrics-dir ""
+(defcustom emms-lyrics-dir "~/music/lyrics"
hunk ./emms-lyrics.el 143
-  (message "emms lyrics disabled."))
+  (message "EMMS lyrics disabled"))
hunk ./emms-lyrics.el 159
-       (message "Disable lyrics on minibufer."))
+       (message "Disable lyrics on minibufer"))
hunk ./emms-lyrics.el 161
-    (message "Enable lyrics on minibufer.")))
+    (message "Enable lyrics on minibufer")))
hunk ./emms-lyrics.el 170
-       (message "Disable lyrics on mode line."))
+       (message "Disable lyrics on mode line"))
hunk ./emms-lyrics.el 172
-    (message "Enable lyrics on mode line.")))
+    (message "Enable lyrics on mode line")))
hunk ./emms-lyrics.el 450
-        (when (not (string= emms-lyrics-dir ""))
+        (when (and (file-exists-p emms-lyrics-dir)
+                   (not (string= emms-lyrics-dir "")))
}

[emms-setup.el: Enable emms-score in emms-devel.
William Xu <address@hidden>**20070717131538] {
hunk ./emms-setup.el 137
+  (emms-score 1)
hunk ./emms-setup.el 140
-
}

[emms-playlist-sort.el: Bind "s s" to emms-playlist-sort-by-score.
William Xu <address@hidden>**20070719065003] {
hunk ./emms-playlist-sort.el 89
-
hunk ./emms-playlist-sort.el 96
-     (define-key emms-playlist-mode-map (kbd "s l") 
'emms-playlist-sort-by-list)))
+     (define-key emms-playlist-mode-map (kbd "s l") 
'emms-playlist-sort-by-list)
+     (define-key emms-playlist-mode-map (kbd "s s") 
'emms-playlist-sort-by-score)))
}

Context:

[emms-playlist-limit.el: Add missing line: (define-emms-playlist-limit 
info-title).
William Xu <address@hidden>**20070711071022] 
[emms-playlist-limit.el: Minor updates.
William Xu <address@hidden>**20070709103714] 
[emms-playlist-limit.el: Update Copyright to GPLv3.
William Xu <address@hidden>**20070708140012] 
[emms-playlist-sort.el: Minor updates.
William Xu <address@hidden>**20070708120050] 
[emms-playlist-limit.el: Redefine functions emms-playlist-limit-to-* with
William Xu <address@hidden>**20070708115907
 macro: define-emms-playlist-limit.
] 
[emms-playlist-limit.el: Add default value based on track at point for
William Xu <address@hidden>**20070708040809
 emms-playlist-limit-to-*.
] 
[New file: emms-playlist-limit.el. And minor updates to emms-playlist-sort.
William Xu <address@hidden>**20070705160221] 
[emms-player-mplayer.el: Add "eng.srt", "chs.srt", "cht.srt" to
William Xu <address@hidden>**20070630124728
 emms-player-mplayer-subtitle-extensions.
] 
[Updated NEWS for post-3.0
address@hidden 
[TAG 3.0
address@hidden 
Patch bundle hash:
30b8811259289e27c2b51f295e545218bb7b14fb