* lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)

(vc-mtn-workfile-branch): Adjust to new output format.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f90ebef697238083b7894d58eaee8a83e094230a..45066263c5e896bbb6a99a81c3a822b5128d1f48 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-08  Richard Levitte  <richard@levitte.org>  (tiny patch)
+
+       * vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
+       (vc-mtn-workfile-branch): Adjust to new output format.
+
 2010-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * international/mule-cmds.el (princ-list): Mark as obsolete.

diff --git a/lisp/vc-mtn.el b/lisp/vc-mtn.el
index aa90fdabc87b69a82edf6d9a9fee4f4b8df2a497..f89b6a34d21affe03b52d440eed22c717deaa3af 100644 (file)
--- a/lisp/vc-mtn.el
+++ b/lisp/vc-mtn.el
@@ -109,7 +109,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
 (defun vc-mtn-after-dir-status (update-function)
   (let (result)
     (goto-char (point-min))
-    (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)" nil t)
+    (re-search-forward "\\(?:Current b\\|B\\)ranch:  *\\(.*\\)\n?\nChanges against parent \\(.*\\)" nil t)
     (while (re-search-forward
            "^  \\(?:\\(patched  \\)\\|\\(added    \\)\\)\\(.*\\)$" nil t)
       (cond  ((match-end 1) (push (list (match-string 3) 'edited) result))
@@ -128,7 +128,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
     (with-temp-buffer
       (vc-mtn-command t 0 file "status")
       (goto-char (point-min))
-      (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)")
+      (re-search-forward "\\(?:Current b\\|B\\)ranch:  *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
       (match-string 2))))
 
 (defun vc-mtn-workfile-branch (file)
@@ -138,7 +138,7 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
     (with-temp-buffer
       (vc-mtn-command t 0 file "status")
       (goto-char (point-min))
-      (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)")
+      (re-search-forward "\\(?:Current b\\|B\\)ranch:  *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
       (match-string 1))))
 
 (defun vc-mtn-workfile-unchanged-p (file)