From: Mark Oteiza <mvoteiza@udel.edu>
To: <emacs-devel@gnu.org>
Cc: Mark Oteiza <mvoteiza@udel.edu>
Subject: [PATCH 1/3] lisp/mpc.el (mpc-file-local-copy): check more config locations
Date: Mon, 7 Sep 2015 19:31:20 -0400 [thread overview]
Message-ID: <1441668682-21988-1-git-send-email-mvoteiza@udel.edu> (raw)
---
Updated according to mpd(1) of mpd version 0.19.10
lisp/mpc.el | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lisp/mpc.el b/lisp/mpc.el
index fdc5aee..740b865 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)))
--
2.5.1
next reply other threads:[~2015-09-07 23:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-07 23:31 Mark Oteiza [this message]
2015-09-07 23:31 ` [PATCH 2/3] lisp/mpc.el (mpc-file-local-copy): check for absolute path Mark Oteiza
2015-09-07 23:31 ` [PATCH 3/3] lisp/mpc.el (mpc--proc-connect): use file-name-absolute-p Mark Oteiza
2015-09-08 1:16 ` Stefan Monnier
2015-09-08 1:57 ` Mark Oteiza
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1441668682-21988-1-git-send-email-mvoteiza@udel.edu \
--to=mvoteiza@udel.edu \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).