* lisp/mpc.el (mpc-songs-jump-to): Adjust to different playlist format.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0d860498a1055f36ef2b3d51e387487eb583a1d6..db02ef7a67fa57480a0221f63465338df53667bf 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2013-10-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * mpc.el (mpc-songs-jump-to): Adjust to different playlist format.
+
        * vc/pcvs.el: Use lexical-binding.
        (cvs-temp-buffer, cvs-make-cvs-buffer): Pass some vars in the lexical
        environment of `eval'.

diff --git a/lisp/mpc.el b/lisp/mpc.el
index 2bb3f91abc9ed2bfdc7e85b70b3cd7226bdb2aef..e07511c4f128f3e68b3a42e7e2e11f0d301a38fd 100644 (file)
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -2009,7 +2009,9 @@ This is used so that they can be compared with `eq', which is needed for
              posn))))
   (let* ((plbuf (mpc-proc-cmd "playlist"))
          (re (if song-file
-                (concat "^\\([0-9]+\\):" (regexp-quote song-file) "$")))
+                 ;; Newer MPCs apparently include "file: " in the buffer.
+                (concat "^\\([0-9]+\\):\\(?:file: \\)?"
+                         (regexp-quote song-file) "$")))
          (sn (with-current-buffer plbuf
                (goto-char (point-min))
                (when (and re (re-search-forward re nil t))