From: Mark Oteiza <mvoteiza@udel.edu>
Date: Mon, 7 Sep 2015 21:56:06 +0000 (-0400)
Subject: lisp/mpc.el (mpc-file-local-copy): check more config locations
X-Git-Tag: emacs-25.0.90~1224^2~161
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2a79268725c2d5602e9bc4a512bee7510bfbfa18;p=emacs.git

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

diff --git a/lisp/mpc.el b/lisp/mpc.el
index b7c19a967fa..205c94b4965 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)))