aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrasmus <rasmus@gmx.us>2015-03-10 12:55:27 +0100
committerrasmus <rasmus@gmx.us>2015-03-10 12:58:39 +0100
commita2f4ee1aeaf433801b57163829b969b5a055949a (patch)
tree5644b910607400819bd8dc1643210dc619b7ca4e
parent428d6628917a3a413a0da30be2192c8822cc5db1 (diff)
Fix bug in introduced in 428d662
- emms.texinfo: used wrong variable. - emms-librefm-scrobbler.el: remove warning.
-rw-r--r--doc/emms.texinfo2
-rw-r--r--lisp/emms-librefm-scrobbler.el2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/emms.texinfo b/doc/emms.texinfo
index 7c973a6..40bb6f1 100644
--- a/doc/emms.texinfo
+++ b/doc/emms.texinfo
@@ -1280,7 +1280,7 @@ file, typically @file{~/.authinfo.gpg}, as:
machine libre.fm login USERNAME password PASSWORD
@end smallexample
If you are using some other server than libre.fm, change
-``@example{libre.fm}'' to match
+``@samp{libre.fm}'' to match
@var{emms-librefm-scrobbler-handshake-url}.
Alternatively, you can save the password in plaintext in your init-file
diff --git a/lisp/emms-librefm-scrobbler.el b/lisp/emms-librefm-scrobbler.el
index 98da520..28c4c02 100644
--- a/lisp/emms-librefm-scrobbler.el
+++ b/lisp/emms-librefm-scrobbler.el
@@ -30,6 +30,7 @@
;;; Code:
(require 'emms-playing-time)
+(require 'auth-source)
(defvar emms-librefm-scrobbler-handshake-url
@@ -86,7 +87,6 @@ See also `emms-librefm-scrobbler-username'.")
TOKEN is :user of :secret."
;; TODO: Maybe we should enable :create t here. But it could be
;; kind of annoying as it makes a pop-up when no name is present.
- (require 'auth-source)
(plist-get
(car (auth-source-search :host (list emms-librefm-scrobbler-handshake-url "libre.fm")
:user (unless (equal emms-librefm-scrobbler-username "")