aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Xu <william.xwl@gmail.com>2007-07-17 10:09:00 +0000
committerWilliam Xu <william.xwl@gmail.com>2007-07-17 10:09:00 +0000
commita268ebf390ab047a008f3d23316108036ee5a285 (patch)
treed538fc995bc254fad755763afa73772af54b31b7
parent3b34bdd7fb862f8784ce55990919ac5cb3b61803 (diff)
emms-lyrics.el: Set default value for emms-lyrics-dir to ~/music/lyrics.
darcs-hash:20070717100946-cfa61-180581868458fce85e1affc4ecf564a7e9e7bf6b.gz
-rw-r--r--emms-lyrics.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/emms-lyrics.el b/emms-lyrics.el
index 7e86acd..b4f4fd7 100644
--- a/emms-lyrics.el
+++ b/emms-lyrics.el
@@ -82,7 +82,7 @@
:type 'boolean
:group 'emms-lyrics)
-(defcustom emms-lyrics-dir ""
+(defcustom emms-lyrics-dir "~/music/lyrics"
"Local lyrics repository.
`emms-lyrics-find-lyric' will look for lyrics in current directory(i.e.,
same as the music file) and this directory."
@@ -140,7 +140,7 @@ same as the music file) and this directory."
"Disable displaying emms lyrics."
(interactive)
(emms-lyrics -1)
- (message "emms lyrics disabled."))
+ (message "EMMS lyrics disabled"))
;;;###autoload
(defun emms-lyrics-toggle ()
@@ -156,9 +156,9 @@ same as the music file) and this directory."
(if emms-lyrics-display-on-minibuffer
(progn
(setq emms-lyrics-display-on-minibuffer nil)
- (message "Disable lyrics on minibufer."))
+ (message "Disable lyrics on minibufer"))
(setq emms-lyrics-display-on-minibuffer t)
- (message "Enable lyrics on minibufer.")))
+ (message "Enable lyrics on minibufer")))
(defun emms-lyrics-toggle-display-on-modeline ()
"Toggle display lyrics on mode line."
@@ -167,9 +167,9 @@ same as the music file) and this directory."
(progn
(setq emms-lyrics-display-on-modeline nil
emms-lyrics-mode-line-string "")
- (message "Disable lyrics on mode line."))
+ (message "Disable lyrics on mode line"))
(setq emms-lyrics-display-on-modeline t)
- (message "Enable lyrics on mode line.")))
+ (message "Enable lyrics on mode line")))
(defun emms-lyrics (arg)
"Turn on emms lyrics display if ARG is positive, off otherwise."
@@ -447,7 +447,8 @@ e.g., (emms-lyrics-find-lyric \"abc.lrc\")"
;; luck! :-)
(if (file-exists-p (concat dir file)) ; same directory?
(concat dir file)
- (when (not (string= emms-lyrics-dir ""))
+ (when (and (file-exists-p emms-lyrics-dir)
+ (not (string= emms-lyrics-dir "")))
(let* ((ret (car
(split-string
(shell-command-to-string