lisp/mpc.el (mpc-file-local-copy): check more config locations

This commit is contained in:
Mark Oteiza 2015-09-07 17:56:06 -04:00
parent 0fafb58295
commit 2a79268725

View file

@ -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)))