diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-09-11 14:31:45 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-09-11 14:31:45 -0400 |
| commit | d3506ca5a0a4deca042d9cf91e5cbba083675220 (patch) | |
| tree | 8fbf436f1364a68156d50a0f258a66819be05b13 | |
| parent | 5ec0337a36f61c2bd6c7c3ef8102f7deeeafd09a (diff) | |
| download | emacs-d3506ca5a0a4deca042d9cf91e5cbba083675220.tar.gz | |
* lisp/vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.
Check cvs-sort-ignore-file is bound.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/vc-cvs.el | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7e08e40480..cf1fa06aee8 100644 --- 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 931193c46e0..75b54450926 100644 --- 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) |