[Emacs-diffs] trunk r114217: * lisp/vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.

[Glenn Morris]

------------------------------------------------------------
revno: 114217
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2013-09-11 14:31:45 -0400
message:
  * lisp/vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.
  Check cvs-sort-ignore-file is bound.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/vc-cvs.el              vccvs.el-20091113204419-o5vbwnq5f7feedwu-1927

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-11 17:27:22 +0000
+++ b/lisp/ChangeLog    2013-09-11 18:31:45 +0000
@@ -1,5 +1,8 @@
 2013-09-11  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/vc/vc-cvs.el'
--- a/lisp/vc/vc-cvs.el 2013-09-04 21:09:42 +0000
+++ b/lisp/vc/vc-cvs.el 2013-09-11 18:31:45 +0000
@@ -1226,7 +1226,7 @@
                    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 @@
     (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)