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

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

Fixes: debbugs:13380

2 files changed, 14 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3c1a51855ab..18481cb5aa5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el
index 52dc7edfa2d..208b93d9670 100644
--- a/lisp/vc/pcvs.el
+++ b/lisp/vc/pcvs.el
@@ -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 ()