mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/vc/pcvs.el (cvs-cleanup-collection): Extend meaning of `rm-handled'.

Browse source 
(cvs-mode-remove-handled): Use it.

Fixes: debbugs:13380
This commit is contained in:
Stefan Monnier 2013-01-08 12:34:35 -05:00
parent 63a63bd434
commit 1c851e98b6
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2013-01-08 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/pcvs.el (cvs-cleanup-collection): Extend meaning of `rm-handled'.
(cvs-mode-remove-handled): Use it (bug#13380).
* emacs-lisp/nadvice.el (advice--tweak): New function.
(advice--remove-function, advice--subst-main): Use it.

20
lisp/vc/pcvs.el
View file

@ -856,7 +856,8 @@ the problem."
(defun cvs-cleanup-collection (c rm-handled rm-dirs rm-msgs)
"Remove undesired entries.
C is the collection
RM-HANDLED if non-nil means remove handled entries.
RM-HANDLED if non-nil means remove handled entries (if file is currently
visited, only remove if value is `all').
RM-DIRS behaves like `cvs-auto-remove-directories'.
RM-MSGS if non-nil means remove messages."
(let (last-fi first-dir (rerun t))
@ -870,16 +871,17 @@ RM-MSGS if non-nil means remove messages."
(subtype (cvs-fileinfo->subtype fi))
(keep
(pcase type
;; remove temp messages and keep the others
;; Remove temp messages and keep the others.
(`MESSAGE (not (or rm-msgs (eq subtype 'TEMP))))
;; remove entries
;; Remove dead entries.
(`DEAD nil)
;; handled also?
;; Handled also?
(`UP-TO-DATE
(if (find-buffer-visiting (cvs-fileinfo->full-name fi))
t
(not rm-handled)))
;; keep the rest
(not
(if (find-buffer-visiting (cvs-fileinfo->full-name fi))
(eq rm-handled 'all)
rm-handled)))
;; Keep the rest.
(_ (not (run-hook-with-args-until-success
'cvs-cleanup-functions fi))))))
@ -2121,7 +2123,7 @@ if you are convinced that the process that created the lock is dead."
Empty directories are removed."
(interactive)
(cvs-cleanup-collection cvs-cookies
t (or cvs-auto-remove-directories 'handled) t))
'all (or cvs-auto-remove-directories 'handled) t))
(defun-cvs-mode cvs-mode-acknowledge ()