Commit d767c357 authored by Eli Zaretskii's avatar Eli Zaretskii

Merge branch 'emacs-27' of git.savannah.gnu.org:/srv/git/emacs into emacs-27

parents ff729e3f 4dec693f
...@@ -1222,23 +1222,24 @@ is non-nil." ...@@ -1222,23 +1222,24 @@ is non-nil."
(defun vc-cvs-ignore (file &optional directory _remove) (defun vc-cvs-ignore (file &optional directory _remove)
"Ignore FILE under CVS. "Ignore FILE under CVS.
FILE is either absolute or relative to DIRECTORY. The basename FILE is either absolute or relative to DIRECTORY. The non-directory
of FILE is written unmodified into the ignore file and is part of FILE is written unmodified into the ignore file and is
therefore evaluated by CVS as an ignore pattern which follows therefore evaluated by CVS as an ignore pattern which follows
glob(7) syntax. If the pattern should match any of the special glob(7) syntax. If the pattern should match any of the special
characters ?*[\\\’ literally, they must be escaped with a characters `?*[\\' literally, they must be escaped with a
backslash. backslash.
CVS processes one ignore file for each subdirectory. Patterns CVS processes one ignore file for each subdirectory. Patterns
are separated by whitespace and only match files in the same are separated by whitespace and only match files in the same
directory. Since FILE can be a relative filename with leading directory. Since FILE can be a relative filename with leading
diretories, FILE is expanded against DIRECTORY to determine the directories, FILE is expanded against DIRECTORY to determine the
correct absolute filename. The directory name of this path is correct absolute filename. The directory part of the resulting name
then used to determine the location of the ignore file. The base is then used to determine the location of the ignore file. The
name of this path is used as pattern for the ignore file. non-directory part of the name is used as pattern for the ignore file.
Since patterns are whitespace sparated, it is usually better to Since patterns are whitespace-separated, filenames containing spaces
replace spaces in filenames with question marks ?." cannot be represented directly. A work-around is to replace such
spaces with question marks."
(setq file (directory-file-name (expand-file-name file directory))) (setq file (directory-file-name (expand-file-name file directory)))
(vc-cvs-append-to-ignore (file-name-directory file) (file-name-nondirectory file))) (vc-cvs-append-to-ignore (file-name-directory file) (file-name-nondirectory file)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment