[Emacs-diffs] trunk r114568: * lisp/mpc.el (mpc-songs-jump-to): Adjust to different playlist format.

[Stefan Monnier]

------------------------------------------------------------
revno: 114568
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-10-07 23:48:01 -0400
message:
  * lisp/mpc.el (mpc-songs-jump-to): Adjust to different playlist format.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mpc.el                    mpc.el-20091201190351-ubdosyf8lle4bzd3-10

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-08 03:47:24 +0000
+++ b/lisp/ChangeLog    2013-10-08 03:48:01 +0000
@@ -1,5 +1,7 @@
 2013-10-08  Stefan Monnier  <address@hidden>
 
+       * 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'.

=== modified file 'lisp/mpc.el'
--- a/lisp/mpc.el       2013-09-18 04:44:20 +0000
+++ b/lisp/mpc.el       2013-10-08 03:48:01 +0000
@@ -2009,7 +2009,9 @@
              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))