aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus <rasmus@gmx.us>2016-12-21 14:32:44 +0100
committerRasmus <rasmus@gmx.us>2017-02-22 15:20:26 +0100
commitc3d98fc234cf7ec751c78a63a467449ccfd74376 (patch)
tree674466b63f343e52d26fbc0bbeb691cf699009a6
parentdde22abffb7a47adfe2cf98e4505ac0048e0b5fd (diff)
* lisp/emms-lyrics.el (emms-lyrics-visit-lyric): Fix error from 6bc5
-rw-r--r--lisp/emms-lyrics.el16
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/emms-lyrics.el b/lisp/emms-lyrics.el
index 6325ceb..95b8e29 100644
--- a/lisp/emms-lyrics.el
+++ b/lisp/emms-lyrics.el
@@ -237,18 +237,18 @@ If we can't find it from local disk, then search it from internet."
;; systems, we'd better fall back on filename.
(format emms-lyrics-chinese-url
(emms-url-quote-plus
- (encode-coding-string filename 'gb2312))))
- (t ; English lyrics.
+ (encode-coding-string name 'gb2312))))
+ (t ; English lyrics.g
(format emms-lyrics-latin-url
(if artist (concat (emms-url-quote-underscore artist) ":") "")
(emms-url-quote-underscore title))))))
(if (fboundp 'eww)
- (let ((readable-hook (when (and (fboundp 'eww-readable)
- (not (memq 'eww-readable eww-after-render-hook)))
- (add-hook 'eww-after-render-hook 'eww-readable))))
- (eww url)
- (when readable-hook
- (remove-hook 'eww-after-render-hook 'eww-readable)))
+ (progn (require 'eww)
+ (let ((readable-hook (when (fboundp 'eww-readable)
+ (add-hook 'eww-after-render-hook 'eww-readable))))
+ (eww url)
+ (when readable-hook
+ (remove-hook 'eww-after-render-hook 'eww-readable))))
(browse-url url))
(message "Lyric file does not exist on file-system. Searching online...")))))