Commit 1d2b9bba authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(cvs-append-to-ignore): New arg `old-dir'.

(cvs-mode-ignore): Use it.
parent 0ded0280
......@@ -1861,24 +1861,27 @@ With a prefix argument, prompt for cvs flags."
This command ignores files that are not flagged as `Unknown'."
(dolist (fi (cvs-mode-marked 'ignore))
(cvs-append-to-ignore (cvs-fileinfo->dir fi) (cvs-fileinfo->file fi))
(cvs-append-to-ignore (cvs-fileinfo->dir fi) (cvs-fileinfo->file fi)
(eq (cvs-fileinfo->subtype fi) 'NEW-DIR))
(setf (cvs-fileinfo->type fi) 'DEAD))
(cvs-cleanup-collection cvs-cookies nil nil nil))
(defun cvs-append-to-ignore (dir str)
"Add STR to the .cvsignore file in DIR."
(set-buffer (find-file-noselect (expand-file-name ".cvsignore" dir)))
(defun cvs-append-to-ignore (dir str &optional old-dir)
"Add STR to the .cvsignore file in DIR.
If OLD-DIR is non-nil, then this is a directory that we don't want
to hear about anymore."
(find-file-noselect (expand-file-name ".cvsignore" dir))
(when (ignore-errors
(and buffer-read-only
(eq 'CVS (vc-backend buffer-file-name))
(not (vc-editable-p buffer-file-name))))
;; CVSREAD=on special case
(vc-checkout buffer-file-name t))
(goto-char (point-max))
(unless (zerop (current-column)) (insert "\n"))
(insert str "\n")
(unless (bolp) (insert "\n"))
(insert str (if old-dir "/\n" "\n"))
(if cvs-sort-ignore-file (sort-lines nil (point-min) (point-max)))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment