Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ff6b00de
Commit
ff6b00de
authored
Feb 18, 2010
by
Sam Steingold
Browse files
(vc-cvs-merge-news): Yet another fix of message parsing.
parent
fe8c0b47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/vc-cvs.el
lisp/vc-cvs.el
+2
-2
No files found.
lisp/ChangeLog
View file @
ff6b00de
2010-02-18 Sam Steingold <sds@gnu.org>
* vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing.
2010-02-18 Stefan Monnier <monnier@iro.umontreal.ca>
Use abbreviated file names in bookmarks (bug#5591).
...
...
lisp/vc-cvs.el
View file @
ff6b00de
...
...
@@ -459,8 +459,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
(
if
(
re-search-forward
(
concat
"^\\([CMUP] \\)?"
(
regexp-quote
(
substring
file
(
length
(
expand-file-name
"."
default-directory
))))
(
substring
file
(
1+
(
length
(
expand-file-name
"."
default-directory
))))
)
"\\( already contains the differences between \\)?"
)
nil
t
)
(
cond
...
...
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