[elpa] externals/emms 06ef243 3/3: Merge branch 'cache'

[ELPA Syncer]

branch: externals/emms
commit 06ef243c5a7b60de92ba5503bb385191e35fe21c
Merge: 852cf6d 41a8205
Author: Yoni Rabkin <yoni@rabkins.net>
Commit: Yoni Rabkin <yoni@rabkins.net>

    Merge branch 'cache'
---
 emms-info-native.el | 25 ++++++++++++++-----------
 emms-info.el        |  3 +--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/emms-info-native.el b/emms-info-native.el
index 8601dd0..3e3e2d4 100644
--- a/emms-info-native.el
+++ b/emms-info-native.el
@@ -927,17 +927,20 @@ Return the text as string."
 (defun emms-info-native (track)
   "Set info fields for TRACK.
 Supports Ogg Vorbis/Opus, FLAC, and MP3 files."
-  (let* ((filename (emms-track-name track))
-         (info-fields (emms-info-native--decode-info-fields filename)))
-    (dolist (field info-fields)
-      (let ((name (intern (concat "info-" (car field))))
-            (value (cdr field)))
-        (unless (zerop (length value))
-          (emms-track-set track
-                          name
-                          (if (eq name 'info-playing-time)
-                              (string-to-number value)
-                            (string-trim-right value))))))))
+  (condition-case env
+      (let* ((filename (emms-track-name track))
+             (info-fields (emms-info-native--decode-info-fields filename)))
+       (dolist (field info-fields)
+         (let ((name (intern (concat "info-" (car field))))
+               (value (cdr field)))
+            (unless (zerop (length value))
+              (emms-track-set track
+                              name
+                              (if (eq name 'info-playing-time)
+                                 (string-to-number value)
+                               (string-trim-right value)))))))
+    (error (message "emms-info-native error processing %s: %s"
+                   (emms-track-name track) env))))
 
 (defun emms-info-native--decode-info-fields (filename)
   "Decode info fields from FILENAME.
diff --git a/emms-info.el b/emms-info.el
index b7a6537..a180c3a 100644
--- a/emms-info.el
+++ b/emms-info.el
@@ -57,8 +57,7 @@ too annoying for you, set this variable to nil."
   :type 'boolean)
 
 (defcustom emms-info-asynchronously t
-  "Non-nil when track information should be loaded asynchronously.
-This requires `emms-later-do', which should come with EMMS."
+  "Non-nil when track information should be loaded asynchronously."
   :type 'boolean)
 
 (defcustom emms-info-report-each-num-tracks 200