From 82bd4e9840db47910ed42534a775184026640399 Mon Sep 17 00:00:00 2001 From: yonirabkin Date: Mon, 19 Sep 2005 21:05:00 +0000 Subject: fixing track killing some more darcs-hash:20050919210533-be80e-c5fa4f158225ee65e1b9d65171dcffef02fd0a7c.gz --- emms-playlist-mode.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/emms-playlist-mode.el b/emms-playlist-mode.el index 01b0179..f7da6a7 100644 --- a/emms-playlist-mode.el +++ b/emms-playlist-mode.el @@ -72,7 +72,7 @@ (define-key emms-playlist-mode-map (kbd "p") 'emms-previous) (define-key emms-playlist-mode-map (kbd "C-x C-s") 'emms-playlist-mode-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") 'emms-playlist-mode-insert-last-killed) + (define-key emms-playlist-mode-map (kbd "C-y") 'emms-playlist-mode-yank) (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) @@ -133,15 +133,16 @@ FUN should be a function." (emms-stop)) (emms-start)) -(defun emms-playlist-mode-insert-last-killed () +(defun emms-playlist-mode-yank () (interactive) (let ((inhibit-read-only t) (track nil)) (with-temp-buffer (yank) (setq track (get-text-property (point-min) 'emms-track))) - (if track - (funcall emms-playlist-insert-track-function track) + (if track ; if -> cond when non-tracks arrive + (progn (funcall emms-playlist-insert-track-function track) + (forward-line -1)) (error "No playlist info to yank")))) ;; The logic for killing tracks in an interactive manner is -- cgit v1.2.3