aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el10
2 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d797e665d48..d5581dc6464 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-03-28 Eli Zaretskii <eliz@gnu.org>
2
3 * files.el (shell-quote-wildcard-pattern): Doc fix.
4
12009-03-27 Eli Zaretskii <eliz@gnu.org> 52009-03-27 Eli Zaretskii <eliz@gnu.org>
2 6
3 * ls-lisp.el (ls-lisp-insert-directory): Allow for a trailing '/' 7 * ls-lisp.el (ls-lisp-insert-directory): Allow for a trailing '/'
diff --git a/lisp/files.el b/lisp/files.el
index 589d267407a..2ab2e88161f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5254,12 +5254,14 @@ and `list-directory-verbose-switches'."
5254 "Quote characters special to the shell in PATTERN, leave wildcards alone. 5254 "Quote characters special to the shell in PATTERN, leave wildcards alone.
5255 5255
5256PATTERN is assumed to represent a file-name wildcard suitable for the 5256PATTERN is assumed to represent a file-name wildcard suitable for the
5257underlying filesystem. For Unix and GNU/Linux, the characters from the 5257underlying filesystem. For Unix and GNU/Linux, each character from the
5258set [ \\t\\n;<>&|()'\"#$] are quoted with a backslash; for DOS/Windows, all 5258set [ \\t\\n;<>&|()'\"#$] is quoted with a backslash; for DOS/Windows, all
5259the parts of the pattern which don't include wildcard characters are 5259the parts of the pattern which don't include wildcard characters are
5260quoted with double quotes. 5260quoted with double quotes.
5261Existing quote characters in PATTERN are left alone, so you can pass 5261
5262PATTERN that already quotes some of the special characters." 5262This function leaves alone existing quote characters (\\ on Unix and \"
5263on Windows), so PATTERN can use them to quote wildcard characters that
5264need to be passed verbatim to shell commands."
5263 (save-match-data 5265 (save-match-data
5264 (cond 5266 (cond
5265 ((memq system-type '(ms-dos windows-nt cygwin)) 5267 ((memq system-type '(ms-dos windows-nt cygwin))