(cvs-addto-collection): Don't merge MESSAGE fileinfos. (cvs-update-filter): Only advertise `cvs-mode-delete-lock' if the lock file appears to be reachable from Emacs. (cvs-mode-mark-on-state, cvs-mode-display-file): New functions. (cvs-mode-find-file): Look for cvs-header-face rather than cvs-dirname-face (which doesn't exist). (cvs-mode-find-file): Allow `other' to be set to `dont-select'.