diff options
| author | William Xu <william.xwl@gmail.com> | 2007-05-14 08:57:00 +0000 |
|---|---|---|
| committer | William Xu <william.xwl@gmail.com> | 2007-05-14 08:57:00 +0000 |
| commit | 0294df91c5a8a7129fe4e4b76fe4a9aafc0caf22 (patch) | |
| tree | 124a46613132a1e26e32b5a6b247f424163c50ae | |
| parent | 28e694dbe9cef653d4cf50deecb32dd67d474c89 (diff) | |
emms-lyrics.el: (emms-lyrics-display): Fix "displaying only on minibuf"
bug, it works now.
darcs-hash:20070514085722-cfa61-dfd13b132c204b51493467a096aa57e085647184.gz
| -rw-r--r-- | emms-lyrics.el | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/emms-lyrics.el b/emms-lyrics.el index cfbf40f..6de15ae 100644 --- a/emms-lyrics.el +++ b/emms-lyrics.el @@ -433,7 +433,7 @@ display." (force-mode-line-update)) (when emms-lyrics-display-on-minibuffer (unless (minibuffer-window-active-p (selected-window)) - (message emms-lyrics-mode-line-string))))) + (message lyric))))) (defun emms-lyrics-find-lyric (file) "Return full path of found lrc FILE, or nil if not found. @@ -448,14 +448,15 @@ e.g., (emms-lyrics-find-lyric \"abc.lrc\")" (if (file-exists-p (concat dir file)) ; same directory? (concat dir file) (when (not (string= emms-lyrics-dir "")) - (let* ((ret (car (split-string - (shell-command-to-string - (concat emms-source-file-gnu-find " " - emms-lyrics-dir " -name " - "'" ; wrap up whitespaces, FIXME, '->\' - (emms-replace-regexp-in-string "'" "*" file) - "'")) - "\n")))) + (let* ((ret (car + (split-string + (shell-command-to-string + (concat emms-source-file-gnu-find " " + emms-lyrics-dir " -name " + (shell-quote-argument + (emms-replace-regexp-in-string + "'" "*" file)))) + "\n")))) (unless (equal ret "") ret))))))) |