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
a0c6a0fb
Commit
a0c6a0fb
authored
Feb 03, 2010
by
Juri Linkov
Browse files
* ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
'(RCS SCCS) with inverted condition.
parent
c35fcd52
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/ediff-util.el
lisp/ediff-util.el
+2
-2
No files found.
lisp/ChangeLog
View file @
a0c6a0fb
2010-02-02 Juri Linkov <juri@jurta.org>
* ediff-util.el (ediff-file-checked-in-p): Replace '(nil CVS) by
'(RCS SCCS) with inverted condition.
2010-02-02 Michael Albinus <michael.albinus@gmx.de>
* net/ange-ftp.el (ange-ftp-skip-msgs): Ignore all ""^500 .*AUTH"
...
...
lisp/ediff-util.el
View file @
a0c6a0fb
...
...
@@ -1126,8 +1126,8 @@ of the current buffer."
(
defun
ediff-file-checked-in-p
(
file
)
(
and
(
featurep
'vc-hooks
)
;; C
V
S files are considered
not
checked in
(
not
(
memq
(
vc-backend
file
)
'
(
nil
CVS
)
))
;;
Only RCS and SC
CS files are considered checked in
(
memq
(
vc-backend
file
)
'
(
RCS
SCCS
))
(
if
(
fboundp
'vc-state
)
(
and
(
not
(
memq
(
vc-state
file
)
'
(
edited
needs-merge
)))
...
...
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