Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
05539fb3
Commit
05539fb3
authored
Nov 08, 2010
by
Richard Levitte
Committed by
Stefan Monnier
Nov 08, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* lisp/vc-mtn.el (vc-mtn-working-revision, vc-mtn-after-dir-status)
(vc-mtn-workfile-branch): Adjust to new output format.
parent
cc4d2366
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc-mtn.el
lisp/vc-mtn.el
+3
-3
No files found.
lisp/ChangeLog
View file @
05539fb3
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.
...
...
lisp/vc-mtn.el
View file @
05539fb3
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment