diff options
| author | Xue Fuqiao <xfq.free@gmail.com> | 2013-09-04 08:31:13 +0800 |
|---|---|---|
| committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-09-04 08:31:13 +0800 |
| commit | 63191d9f2043d2e67657e85a7b3842805dd1dad6 (patch) | |
| tree | cb390bbda4b775652b1fd58b09d2df8e0013fc4f /lisp/vc/vc-git.el | |
| parent | 99191b89ff64172740add88e67f163619a07830c (diff) | |
| download | emacs-63191d9f2043d2e67657e85a7b3842805dd1dad6.tar.gz | |
Some fixes for vc-ignore.
* lisp/vc/vc.el (vc-ignore): Rewrite.
(vc-default-ignore): New function.
(vc-default-ignore-completion-table): Use find-ignore-file.
* lisp/vc/vc-bzr.el (vc-bzr-ignore, vc-bzr-ignore-completion-table):
* lisp/vc/vc-git.el (vc-git-ignore, vc-git-ignore-completion-table):
* lisp/vc/vc-hg.el (vc-hg-ignore, vc-hg-ignore-completion-table):
Remove. Most code moved to vc.el.
* doc/emacs/maintaining.texi (VC Ignore): Mention `vc-ignore' with prefix argument.
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 472c42840af..07b7d15299f 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -680,22 +680,6 @@ It is based on `log-edit-mode', and has Git-specific extensions.") nil "cat-file" "blob" (concat (if rev rev "HEAD") ":" fullname)))) -(defun vc-git-ignore (file &optional directory remove) - "Ignore FILE under Git. -If DIRECTORY is non-nil, the repository to use will be deduced by -DIRECTORY; if REMOVE is non-nil, remove FILE from ignored files." - (let (gitignore) - (if directory - (setq gitignore (vc-git-find-ignore-file directory)) - (setq gitignore (vc-git-find-ignore-file default-directory))) - (if remove - (vc--remove-regexp file gitignore) - (vc--add-line file gitignore)))) - -(defun vc-git-ignore-completion-table (file) - "Return the list of ignored files." - (vc--read-lines (vc-git-find-ignore-file file))) - (defun vc-git-find-ignore-file (file) "Return the root directory of the repository of FILE." (expand-file-name ".gitignore" |