aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emms-source-file.el16
-rw-r--r--emms.el4
-rw-r--r--later-do.el2
3 files changed, 12 insertions, 10 deletions
diff --git a/emms-source-file.el b/emms-source-file.el
index 5384f4a..79bbfc7 100644
--- a/emms-source-file.el
+++ b/emms-source-file.el
@@ -135,13 +135,15 @@ value of `emms-source-file-default-directory'."
emms-source-file-default-directory
emms-source-file-default-directory
t)))
- (mapc (lambda (file)
- (unless (let ((case-fold-search nil))
- (string-match emms-source-file-exclude-regexp file))
- (emms-playlist-insert-track
- (emms-track 'file file))))
- (emms-source-file-directory-tree (expand-file-name dir)
- (emms-source-file-regex))))
+ (let ((files (emms-source-file-directory-tree (expand-file-name dir)
+ (emms-source-file-regex)))
+ (case-fold-search nil))
+ (emms-playlist-ensure-playlist-buffer)
+ (mapc (lambda (file)
+ (unless (string-match emms-source-file-exclude-regexp file)
+ (funcall emms-playlist-insert-track-function
+ (emms-track 'file file))))
+ files)))
;;;###autoload (autoload 'emms-play-find "emms-source-file" nil t)
;;;###autoload (autoload 'emms-add-find "emms-source-file" nil t)
diff --git a/emms.el b/emms.el
index 71e4529..6a2f8cd 100644
--- a/emms.el
+++ b/emms.el
@@ -1344,11 +1344,11 @@ or negative to seek backwards."
;; This is a simple helper data structure, used by both players
;; and tracks.
-(defun emms-dictionary (name)
+(defsubst emms-dictionary (name)
"Create a new dictionary of type NAME."
(list name))
-(defun emms-dictionary-type (dict)
+(defsubst emms-dictionary-type (dict)
"Return the type of the dictionary DICT."
(car dict))
diff --git a/later-do.el b/later-do.el
index 6c98da0..8c04c1d 100644
--- a/later-do.el
+++ b/later-do.el
@@ -52,7 +52,7 @@ time after this call, and definitely not while lisp is still
executing.
Code added using `later-do' is guaranteed to be executed in the
sequence it was added."
- (setq later-do-list (append later-do-list
+ (setq later-do-list (nconc later-do-list
(list (cons function args))))
(unless later-do-timer
(setq later-do-timer