mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

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

Browse Source 
(vc-mtn-workfile-branch): Adjust to new output format.
This commit is contained in:
Richard Levitte 2010-11-08 13:42:24 -05:00 committed by Stefan Monnier
parent cc4d2366a7
commit 05539fb32a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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.

6
lisp/vc-mtn.el
View File

@ -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)