[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/emms fa8f64e 33/80: Fix whitespace trimming
From: |
Stefan Monnier |
Subject: |
[elpa] externals/emms fa8f64e 33/80: Fix whitespace trimming |
Date: |
Wed, 17 Mar 2021 18:42:25 -0400 (EDT) |
branch: externals/emms
commit fa8f64e6a98373922c88af01d87046af2497d03d
Author: Petteri Hintsanen <petterih@iki.fi>
Commit: Petteri Hintsanen <petterih@iki.fi>
Fix whitespace trimming
Don't try to trim nil.
---
emms-info-native.el | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/emms-info-native.el b/emms-info-native.el
index d0c9777..0c7a220 100644
--- a/emms-info-native.el
+++ b/emms-info-native.el
@@ -753,12 +753,13 @@ Supports Ogg Vorbis/Opus, FLAC, and MP3 files."
(info-fields (emms-info-native--decode-info-fields filename)))
(dolist (field info-fields)
(let ((name (intern (concat "info-" (car field))))
- (value (string-trim-right (cdr field))))
- (emms-track-set track
- name
- (if (eq name 'info-playing-time)
- (string-to-number value)
- value))))))
+ (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))))))))
(defun emms-info-native--decode-info-fields (filename)
"Decode info fields from FILENAME.
- [elpa] externals/emms bc5e516 14/80: Add id3v2 (MP3) support to emms-info-native, (continued)
- [elpa] externals/emms bc5e516 14/80: Add id3v2 (MP3) support to emms-info-native, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 9c8d961 15/80: Simplify Ogg-related code, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 17e5c6a 05/80: * doc/emms.texinfo: setup examples, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 209077e 07/80: * doc/emms.texinfo: update manual, Stefan Monnier, 2021/03/17
- [elpa] externals/emms d0142e7 11/80: Merge branch 'info-native', Stefan Monnier, 2021/03/17
- [elpa] externals/emms b8e1de7 17/80: Clean up Opus code, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 810dd41 18/80: Fix typos in Commentary, Stefan Monnier, 2021/03/17
- [elpa] externals/emms dbcc614 24/80: Fix id3v2 bugs, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 0f11ae1 22/80: Reorder functions and constants, Stefan Monnier, 2021/03/17
- [elpa] externals/emms e89bc15 26/80: Merge branch 'info-native', Stefan Monnier, 2021/03/17
- [elpa] externals/emms fa8f64e 33/80: Fix whitespace trimming,
Stefan Monnier <=
- [elpa] externals/emms 5aea8e7 35/80: Fix id3v2 frame id to info-field mapping, Stefan Monnier, 2021/03/17
- [elpa] externals/emms f9f2bab 30/80: Trim trailing whitespace from id3v2 strings, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 60c9304 32/80: Trim trailing whitespace from all info-fields, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 6e5d477 21/80: Simplify FLAC code, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 757043b 41/80: Merge branch 'info-native', Stefan Monnier, 2021/03/17
- [elpa] externals/emms 7479d7d 19/80: Use lexical binding, Stefan Monnier, 2021/03/17
- [elpa] externals/emms a372976 20/80: Fix Opus channel mapping decoding, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 4a4a358 23/80: Remove emms-info-native return value, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 0fe6100 28/80: Improve id3v2 error handling, Stefan Monnier, 2021/03/17
- [elpa] externals/emms cd437ca 40/80: Fix byte compilation, Stefan Monnier, 2021/03/17