Commit d3506ca5 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.

Check cvs-sort-ignore-file is bound.
parent 5ec0337a
2013-09-11 Glenn Morris <rgm@gnu.org>
* vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.
Check cvs-sort-ignore-file is bound.
* savehist.el: No need for cl when compiling on Emacs.
2013-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
......
......@@ -1226,7 +1226,7 @@ is non-nil."
table (lambda () (vc-cvs-revision-table (car files))))))
table))
(defun vc-cvs-ignore (file)
(defun vc-cvs-ignore (file &optional _directory _remove)
"Ignore FILE under CVS."
(cvs-append-to-ignore (file-name-directory file) file))
......@@ -1245,7 +1245,9 @@ to hear about anymore."
(goto-char (point-max))
(unless (bolp) (insert "\n"))
(insert str (if old-dir "/\n" "\n"))
(if cvs-sort-ignore-file (sort-lines nil (point-min) (point-max)))
;; FIXME this is a pcvs variable.
(if (bound-and-true-p cvs-sort-ignore-file)
(sort-lines nil (point-min) (point-max)))
(save-buffer)))
(provide 'vc-cvs)
......
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