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
47dd5958
Commit
47dd5958
authored
May 30, 2008
by
Stefan Monnier
Browse files
(vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
return `unregistered' when applicable.
parent
8f39c96d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
+8
-4
lisp/ChangeLog
lisp/ChangeLog
+4
-1
lisp/vc-cvs.el
lisp/vc-cvs.el
+4
-3
No files found.
lisp/ChangeLog
View file @
47dd5958
2008-05-30 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-cvs.el (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
return `unregistered' when applicable.
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
Don't encourage naming variables with "-flag".
...
...
@@ -295,7 +298,7 @@
* vc.el (vc-delete-file): Don't try to resynch the buffer.
2008-05-23 Paul R <paul.r.ml@gmail.com>
2008-05-23 Paul R
ivier
<paul.r.ml@gmail.com>
* textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
* textmodes/reftex.el (reftex-extra-bindings-map): New var.
...
...
lisp/vc-cvs.el
View file @
47dd5958
...
...
@@ -231,6 +231,7 @@ See also variable `vc-cvs-sticky-date-format-string'."
(
cond
((
equal
checkout-time
lastmod
)
'up-to-date
)
((
string=
(
vc-working-revision
file
)
"0"
)
'added
)
((
null
checkout-time
)
'unregistered
)
(
t
'edited
))))
(
defun
vc-cvs-working-revision
(
file
)
...
...
@@ -800,9 +801,8 @@ state."
((re-search-forward "
\\=\\
(
[^
\t]+\\
)
" nil t)
(setq file (expand-file-name (match-string 1)))
(vc-file-setprop file 'vc-backend 'CVS)
(if (not (re-search-forward "
\\=[
\t]+Status:
\\
(
.
*\\
)
" nil t))
(setq status "
Unknown
")
(setq status (match-string 1)))
(setq status(if (re-search-forward "
\\=[
\t]+Status:
\\
(
.
*\\
)
" nil t)
(match-string 1) "
Unknown
"))
(when (and full
(re-search-forward
"
\\
(
RCS
Version\\|RCS Revision\\|Repository
revision\\
)
:\
...
...
@@ -823,6 +823,7 @@ state."
((string-match "Locally Added" status) 'added)
((string-match "Locally Removed" status) 'removed)
((string-match "File had conflicts " status) 'conflict)
((string-match "Unknown" status) 'unregistered)
(t 'edited))))))))
(defun vc-cvs-after-dir-status (update-function)
...
...
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