Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ed78d16c
Commit
ed78d16c
authored
Dec 26, 2013
by
Xue Fuqiao
Browse files
Some fixes for vc-ignore (Bug#15754).
Inspired by Andreas Politz and Dmitry Gutov.
parents
55db967f
77bbf371
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
15 deletions
+30
-15
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/vc/vc.el
lisp/vc/vc.el
+25
-15
No files found.
lisp/ChangeLog
View file @
ed78d16c
2013-12-25 Xue Fuqiao <xfq.free@gmail.com>
* vc/vc.el (vc-ignore): Use `vc-responsible-backend'.
Fix interactive spec. Doc fix. (Bug#15754)
2013-12-25 Katsumi Yamaoka <yamaoka@jpl.org>
* emacs-lisp/byte-run.el (eval-when-compile):
...
...
lisp/vc/vc.el
View file @
ed78d16c
...
...
@@ -1343,23 +1343,33 @@ first backend that could register the file is used."
(
let
((
vc-handled-backends
(
list
backend
)))
(
call-interactively
'vc-register
)))
(
defun
vc-ignore
(
file
&optional
directory
)
"Ignore FILE under the VCS of DIRECTORY (default is `default-directory').
FILE is a file wildcard.
When called interactively and with a prefix argument, remove FILE
from ignored files.
When called from Lisp code, if DIRECTORY is non-nil, the
repository to use will be deduced by DIRECTORY."
(
defun
vc-ignore
(
file
&optional
directory
remove
)
"Ignore FILE under the VCS of DIRECTORY.
Normally, FILE is a wildcard specification that matches the files
to be ignored. When REMOVE is non-nil, remove FILE from the list
of ignored files.
DIRECTORY defaults to `default-directory' and is used to
determine the responsible VC backend.
When called interactively, prompt for a FILE to ignore, unless a
prefix argument is given, in which case prompt for a file FILE to
remove from the list of ignored files."
(
interactive
(
list
(
read-file-name
"The file to ignore: "
)
(
completing-read
"The file to remove: "
(
vc-call-backend
(
vc-backend
default-directory
)
'ignore-completion-table
default-directory
))))
(
list
(
if
(
not
current-prefix-arg
)
(
read-file-name
"File to ignore: "
)
(
completing-read
"File to remove: "
(
vc-call-backend
(
or
(
vc-responsible-backend
default-directory
)
(
error
"Unknown backend"
))
'ignore-completion-table
default-directory
)))
nil
current-prefix-arg
))
(
let*
((
directory
(
or
directory
default-directory
))
(
backend
(
vc
-backend
default-directory
)
)
(
remove
current-prefix-arg
))
(
backend
(
or
(
vc-responsible
-backend
default-directory
)
(
error
"Unknown backend"
))
))
(
vc-call-backend
backend
'ignore
file
directory
remove
)))
(
defun
vc-default-ignore
(
backend
file
&optional
directory
remove
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment