aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Olson <mwolson@gnu.org>2006-08-01 02:41:00 +0000
committerMichael Olson <mwolson@gnu.org>2006-08-01 02:41:00 +0000
commit6abd26a03f3af8d76806abac5d210252bffbd088 (patch)
treed74132b06ff87aaa470bd3b4834d81d9ad63673b
parentd10458058daca7b53074a3d6d8a297630e2ea288 (diff)
emms-cache: Change default coding system to utf-8. Fix byte-compilation warning.
darcs-hash:20060801024119-1bfb2-ddb4d405acf76fcaa777d4c9a359981bbe015357.gz
-rw-r--r--emms-cache.el2
-rw-r--r--emms-info-mp3info.el11
2 files changed, 7 insertions, 6 deletions
diff --git a/emms-cache.el b/emms-cache.el
index 280de46..15ccd39 100644
--- a/emms-cache.el
+++ b/emms-cache.el
@@ -60,7 +60,7 @@ This is used to cache over emacs sessions.")
:group 'emms
:type 'file)
-(defcustom emms-cache-file-coding-system 'latin-1
+(defcustom emms-cache-file-coding-system 'utf-8
"Coding system used for saving `emms-cache-file'."
:group 'emms
:type 'coding-system)
diff --git a/emms-info-mp3info.el b/emms-info-mp3info.el
index 46d15a0..567f0fc 100644
--- a/emms-info-mp3info.el
+++ b/emms-info-mp3info.el
@@ -88,11 +88,12 @@ This is a useful element for `emms-info-functions'."
(while (looking-at "^\\([^=\n]+\\)=\\(.*\\)$")
(let ((name (intern (match-string 1)))
(value (match-string 2)))
- (unless (eq emms-info-mp3info-coding-system
- emms-cache-file-coding-system)
- (setq value (emms-iconv value
- emms-info-mp3info-coding-system
- emms-cache-file-coding-system)))
+ (and (boundp 'emms-cache-file-coding-system)
+ (not (eq emms-info-mp3info-coding-system
+ emms-cache-file-coding-system))
+ (setq value (emms-iconv value
+ emms-info-mp3info-coding-system
+ emms-cache-file-coding-system)))
(when (> (length value)
0)
(emms-track-set track