diff options
| author | Glenn Morris | 2013-09-11 14:31:45 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-09-11 14:31:45 -0400 |
| commit | d3506ca5a0a4deca042d9cf91e5cbba083675220 (patch) | |
| tree | 8fbf436f1364a68156d50a0f258a66819be05b13 /lisp/vc | |
| parent | 5ec0337a36f61c2bd6c7c3ef8102f7deeeafd09a (diff) | |
| download | emacs-d3506ca5a0a4deca042d9cf91e5cbba083675220.tar.gz emacs-d3506ca5a0a4deca042d9cf91e5cbba083675220.zip | |
* lisp/vc/vc-cvs.el (cvs-append-to-ignore): Fix arg spec.
Check cvs-sort-ignore-file is bound.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-cvs.el | 6 |
1 files changed, 4 insertions, 2 deletions
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." | |||
| 1226 | table (lambda () (vc-cvs-revision-table (car files)))))) | 1226 | table (lambda () (vc-cvs-revision-table (car files)))))) |
| 1227 | table)) | 1227 | table)) |
| 1228 | 1228 | ||
| 1229 | (defun vc-cvs-ignore (file) | 1229 | (defun vc-cvs-ignore (file &optional _directory _remove) |
| 1230 | "Ignore FILE under CVS." | 1230 | "Ignore FILE under CVS." |
| 1231 | (cvs-append-to-ignore (file-name-directory file) file)) | 1231 | (cvs-append-to-ignore (file-name-directory file) file)) |
| 1232 | 1232 | ||
| @@ -1245,7 +1245,9 @@ to hear about anymore." | |||
| 1245 | (goto-char (point-max)) | 1245 | (goto-char (point-max)) |
| 1246 | (unless (bolp) (insert "\n")) | 1246 | (unless (bolp) (insert "\n")) |
| 1247 | (insert str (if old-dir "/\n" "\n")) | 1247 | (insert str (if old-dir "/\n" "\n")) |
| 1248 | (if cvs-sort-ignore-file (sort-lines nil (point-min) (point-max))) | 1248 | ;; FIXME this is a pcvs variable. |
| 1249 | (if (bound-and-true-p cvs-sort-ignore-file) | ||
| 1250 | (sort-lines nil (point-min) (point-max))) | ||
| 1249 | (save-buffer))) | 1251 | (save-buffer))) |
| 1250 | 1252 | ||
| 1251 | (provide 'vc-cvs) | 1253 | (provide 'vc-cvs) |