summaryrefslogtreecommitdiff
path: root/lisp/mpc.el
diff options
context:
space:
mode:
authorMark Oteiza <mvoteiza@udel.edu>2015-09-07 17:56:06 -0400
committerMark Oteiza <mvoteiza@udel.edu>2015-09-10 13:41:09 -0400
commit2a79268725c2d5602e9bc4a512bee7510bfbfa18 (patch)
treed14ed934e730c8ee68c14b8c81d5612e482b964d /lisp/mpc.el
parent0fafb582957135a16a9603c420e992dc46a50544 (diff)
lisp/mpc.el (mpc-file-local-copy): check more config locations
Diffstat (limited to 'lisp/mpc.el')
-rw-r--r--lisp/mpc.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/mpc.el b/lisp/mpc.el
index b7c19a967f..205c94b496 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -910,7 +910,11 @@ If PLAYLIST is t or nil or missing, use the main playlist."
;; Try to set mpc-mpd-music-directory.
(when (and (null mpc-mpd-music-directory)
(string-match "\\`localhost" mpc-host))
- (let ((files '("~/.mpdconf" "/etc/mpd.conf"))
+ (let ((files `(,(let ((xdg (getenv "XDG_CONFIG_HOME")))
+ (concat (if (and xdg (file-name-absolute-p xdg))
+ xdg "~/.config")
+ "/mpd/mpd.conf"))
+ "~/.mpdconf" "~/.mpd/mpd.conf" "/etc/mpd.conf"))
file)
(while (and files (not file))
(if (file-exists-p (car files)) (setq file (car files)))