diff options
| author | Richard Levitte <richard@levitte.org> | 2010-11-08 13:42:24 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-08 13:42:24 -0500 |
| commit | 05539fb32aabb9bf531b70b0ea549314e2446370 (patch) | |
| tree | d4890bdbf868fedbe98172950a1cbbe59b0cdf25 | |
| parent | cc4d2366a733e88a13e85e796a127931266816e4 (diff) | |
| download | emacs-05539fb32aabb9bf531b70b0ea549314e2446370.tar.gz | |
* lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
(vc-mtn-workfile-branch): Adjust to new output format.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/vc-mtn.el | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f90ebef6972..45066263c5e 100644 --- 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 aa90fdabc87..f89b6a34d21 100644 --- 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) |