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
9ba562d3
Commit
9ba562d3
authored
Jul 07, 2009
by
Sam Steingold
Browse files
(vc-cvs-merge-news): Fix message parsing for non-top-level files.
parent
fcaf6f3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc-cvs.el
lisp/vc-cvs.el
+2
-1
No files found.
lisp/ChangeLog
View file @
9ba562d3
2009-07-07 Sam Steingold <sds@gnu.org>
* vc-cvs.el (vc-cvs-merge-news): Fix message parsing for
non-top-level files.
2009-07-07 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (reset-language-environment): Put
...
...
lisp/vc-cvs.el
View file @
9ba562d3
...
...
@@ -457,7 +457,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
0
;; there were no news; indicate success
(
if
(
re-search-forward
(
concat
"^\\([CMUP] \\)?"
(
regexp-quote
(
file-name-nondirectory
file
))
(
regexp-quote
(
substring
file
(
length
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