diff options
| author | Eli Zaretskii | 2009-03-28 12:27:52 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2009-03-28 12:27:52 +0000 |
| commit | 7f94baf012ca987dbef3e981f826523f2e8e02ef (patch) | |
| tree | 073e3c76b065eda753f74d1e2d46da3a4aeb2554 | |
| parent | 9628fed72164a10758c241c2b220f84668a50b14 (diff) | |
| download | emacs-7f94baf012ca987dbef3e981f826523f2e8e02ef.tar.gz emacs-7f94baf012ca987dbef3e981f826523f2e8e02ef.zip | |
(shell-quote-wildcard-pattern): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 10 |
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 @@ | |||
| 1 | 2009-03-28 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * files.el (shell-quote-wildcard-pattern): Doc fix. | ||
| 4 | |||
| 1 | 2009-03-27 Eli Zaretskii <eliz@gnu.org> | 5 | 2009-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 | ||
| 5256 | PATTERN is assumed to represent a file-name wildcard suitable for the | 5256 | PATTERN is assumed to represent a file-name wildcard suitable for the |
| 5257 | underlying filesystem. For Unix and GNU/Linux, the characters from the | 5257 | underlying filesystem. For Unix and GNU/Linux, each character from the |
| 5258 | set [ \\t\\n;<>&|()'\"#$] are quoted with a backslash; for DOS/Windows, all | 5258 | set [ \\t\\n;<>&|()'\"#$] is quoted with a backslash; for DOS/Windows, all |
| 5259 | the parts of the pattern which don't include wildcard characters are | 5259 | the parts of the pattern which don't include wildcard characters are |
| 5260 | quoted with double quotes. | 5260 | quoted with double quotes. |
| 5261 | Existing quote characters in PATTERN are left alone, so you can pass | 5261 | |
| 5262 | PATTERN that already quotes some of the special characters." | 5262 | This function leaves alone existing quote characters (\\ on Unix and \" |
| 5263 | on Windows), so PATTERN can use them to quote wildcard characters that | ||
| 5264 | need 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)) |