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

Check cvs-sort-ignore-file is bound.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c7e08e4048001d79837386b6d08b8134b9fde47b..cf1fa06aee829372d780e33e1d32507bf279c13e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 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>

diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el
index 931193c46e03cbd329e86f1594767bc8d0e9e5db..75b544509267648f121637b185a0ef98571d7d9b 100644 (file)
--- a/lisp/vc/vc-cvs.el
+++ b/lisp/vc/vc-cvs.el
@@ -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)