diff options
| author | Stefan Monnier | 2010-11-09 15:07:10 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-11-09 15:07:10 -0500 |
| commit | d607b96bc2824116a8fe0e5840ce49da7ce4514f (patch) | |
| tree | 229a11bba88b67e8961db4d10aa8b3725f3a4873 /lisp/vc | |
| parent | 27410d0ac3406a341cc90ada064047a7f1ea5209 (diff) | |
| parent | c00980655bc15ca019fd6c559c69601be18f2407 (diff) | |
| download | emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.tar.gz emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-mtn.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/vc/vc-mtn.el b/lisp/vc/vc-mtn.el index 3d76d34f3d8..a1ca6ab4d65 100644 --- a/lisp/vc/vc-mtn.el +++ b/lisp/vc/vc-mtn.el | |||
| @@ -110,7 +110,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 110 | (defun vc-mtn-after-dir-status (update-function) | 110 | (defun vc-mtn-after-dir-status (update-function) |
| 111 | (let (result) | 111 | (let (result) |
| 112 | (goto-char (point-min)) | 112 | (goto-char (point-min)) |
| 113 | (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)" nil t) | 113 | (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)" nil t) |
| 114 | (while (re-search-forward | 114 | (while (re-search-forward |
| 115 | "^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t) | 115 | "^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t) |
| 116 | (cond ((match-end 1) (push (list (match-string 3) 'edited) result)) | 116 | (cond ((match-end 1) (push (list (match-string 3) 'edited) result)) |
| @@ -129,7 +129,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 129 | (with-temp-buffer | 129 | (with-temp-buffer |
| 130 | (vc-mtn-command t 0 file "status") | 130 | (vc-mtn-command t 0 file "status") |
| 131 | (goto-char (point-min)) | 131 | (goto-char (point-min)) |
| 132 | (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)") | 132 | (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)") |
| 133 | (match-string 2)))) | 133 | (match-string 2)))) |
| 134 | 134 | ||
| 135 | (defun vc-mtn-workfile-branch (file) | 135 | (defun vc-mtn-workfile-branch (file) |
| @@ -139,7 +139,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." | |||
| 139 | (with-temp-buffer | 139 | (with-temp-buffer |
| 140 | (vc-mtn-command t 0 file "status") | 140 | (vc-mtn-command t 0 file "status") |
| 141 | (goto-char (point-min)) | 141 | (goto-char (point-min)) |
| 142 | (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)") | 142 | (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)") |
| 143 | (match-string 1)))) | 143 | (match-string 1)))) |
| 144 | 144 | ||
| 145 | (defun vc-mtn-workfile-unchanged-p (file) | 145 | (defun vc-mtn-workfile-unchanged-p (file) |