UNDO: Fix track switching error and interactive playlist yanking

darcs-hash:20050919124513-be80e-19b15bf7f3d48d50eead0ba1cad39f3f29c89ca3.gz

1 files changed, 2 insertions, 16 deletions

diff --git a/emms-playlist-mode.el b/emms-playlist-mode.el
index 4115993..5c81071 100644
--- a/emms-playlist-mode.el
+++ b/emms-playlist-mode.el
@@ -72,13 +72,10 @@
     (define-key emms-playlist-mode-map (kbd "p") 'emms-previous)
     (define-key emms-playlist-mode-map (kbd "C-x C-s") 'emms-playlist-save-buffer)
     (define-key emms-playlist-mode-map (kbd "C-k") 'emms-playlist-mode-kill-track)
-    (define-key emms-playlist-mode-map (kbd "C-y") 
-      #'(lambda () (interactive) (emms-playlist-mode-insert-last-killed-track kill-ring)))
     (define-key emms-playlist-mode-map (kbd "d") 'emms-playlist-mode-kill-track)
     (define-key emms-playlist-mode-map (kbd "s") 'emms-stop)
     (define-key emms-playlist-mode-map (kbd "f") 'emms-show)
     (define-key emms-playlist-mode-map (kbd "c") 'emms-playlist-mode-center-current)
-    (define-key emms-playlist-mode-map (kbd "C") 'emms-playlist-clear)
     (define-key emms-playlist-mode-map (kbd "RET") 'emms-playlist-mode-play-current-track)
     (define-key emms-playlist-mode-map (kbd "q") 'bury-buffer)
     (define-key emms-playlist-mode-map (kbd "<mouse-2>") 'emms-playlist-mode-play-current-track)
@@ -134,17 +131,6 @@ FUN should be a function."
     (emms-stop))
   (emms-start))
 
-(defun emms-playlist-mode-insert-last-killed-track (ring)
-  (if (null ring)
-      (error "No last killed track")
-    (let ((track nil))
-      (with-temp-buffer
-	(insert (car ring))
-	(setq track (get-text-property (point-min) 'emms-track)))
-      (if track
-	  (emms-playlist-insert-track track)
-	(emms-playlist-mode-insert-last-killed-track (cdr ring))))))
-
 ;; The logic for killing tracks in an interactive manner is
 ;; suprisingly annoying
 (defun emms-playlist-mode-kill-track ()
@@ -153,7 +139,7 @@ FUN should be a function."
   (let ((region (emms-property-region (point) 'emms-track))
 	(inhibit-read-only t))
     (cond ((not (emms-playlist-track-at))
-	   (kill-line 1))
+	   (kill-line 1))	     ; Purposfully kills only one line
 	  ((and (not (emms-playlist-mode-selected-at))
 		(emms-playlist-track-at))
 	   (kill-region (car region)
@@ -191,7 +177,7 @@ FACE should be a... face."
 
 (defun emms-playlist-mode-overlay-unselected ()
   ;; point-mix/max because -insert-source narrows the world
-  (emms-playlist-mode-overlay-track (point-min)
+  (emms-playlist-mode-overlay-track (point-min) 
 				    (point-max)
 				    'emms-playlist-track-face
 				    1))