branch: externals/emms
commit 3286ac88bf2c306bd66431205eb80ca3bff3e7ef
Author: Yoni Rabkin <y...@gnu.org>
Commit: Yoni Rabkin <y...@gnu.org>
* emms-player-mpd.el: Match HTTPS URLs in MPD player
patch by Isaac Haller
---
AUTHORS | 1 +
emms-player-mpd.el | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index e32033939b..fd9f57c13d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -66,6 +66,7 @@ ericalinag <ericalinagebh...@gmail.com>
hiecaq <t...@hiecaq.org>
Ian D <du...@gnu.org>
Ian Dunn
+Isaac Haller <is...@hllr.xyz>
Jesse Weinstein <je...@netwood.net>
Katherine Whitlock
Kierin Bell
diff --git a/emms-player-mpd.el b/emms-player-mpd.el
index fcdc53dcdf..e857388978 100644
--- a/emms-player-mpd.el
+++ b/emms-player-mpd.el
@@ -180,14 +180,14 @@ or nil if we cannot figure it out."
;; Create regexp
(when (and (stringp supported)
(not (string= supported "")))
- (concat "\\`http://\\|\\.\\(m3u\\|pls\\|"
+ (concat "\\`http[s]?://\\|\\.\\(m3u\\|pls\\|"
(regexp-opt (delq nil (split-string supported)))
"\\)\\'"))))))
(defcustom emms-player-mpd-supported-regexp
;; Use a sane default, just in case
(or (emms-player-mpd-get-supported-regexp)
- (concat "\\`http://\\|"
+ (concat "\\`http[s]?://\\|"
(emms-player-simple-regexp
"m3u" "ogg" "flac" "mp3" "wav" "mod" "au" "aiff")))
"Formats supported by MusicPD."
@@ -279,7 +279,7 @@ return at the end of a request.")
(defun emms-player-mpd-remote-filenamep (filename)
"Return t if FILENAME is a remote file."
- (string-match "\\`http://"; filename))
+ (string-match "\\`http[s]?://" filename))
(defun emms-player-mpd-sentinel (proc event)
"The process sentinel for MusicPD."
