diff options
| author | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 00:59:34 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina <fgallina@gnu.org> | 2015-01-28 00:59:34 -0300 |
| commit | d7a89815b6d69c3b1793d34bcad8bf0aa21d48c8 (patch) | |
| tree | 6ac62b66bd5386355c96551da34416036cf279b7 /lisp/files.el | |
| parent | 3a8b7013042adae3c27327a75662fd8e884d4896 (diff) | |
| parent | d279e6680842b872ae3aab1fb429b1879db50f7f (diff) | |
| download | emacs-d7a89815b6d69c3b1793d34bcad8bf0aa21d48c8.tar.gz | |
Merge from origin/emacs-24
d279e66 Fix assertion violations in try_window_id (Bug#19511)
031eadc Fix dired quoting bug with "Hit`N`Hide"
5981b4b More doc fixes for bug#19502 -- make documentation less X-specific.
143516c src/emacs.c (syms_of_emacs) <system-configuration>: Doc fix. (Bug#19502)
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/files.el b/lisp/files.el index ed1943dfc28..40a42897419 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -6094,7 +6094,7 @@ and `list-directory-verbose-switches'." PATTERN is assumed to represent a file-name wildcard suitable for the underlying filesystem. For Unix and GNU/Linux, each character from the -set [ \\t\\n;<>&|()'\"#$] is quoted with a backslash; for DOS/Windows, all +set [ \\t\\n;<>&|()`'\"#$] is quoted with a backslash; for DOS/Windows, all the parts of the pattern which don't include wildcard characters are quoted with double quotes. @@ -6108,12 +6108,12 @@ need to be passed verbatim to shell commands." ;; argument has quotes, we can safely assume it is already ;; quoted by the caller. (if (or (string-match "[\"]" pattern) - ;; We quote [&()#$'] in case their shell is a port of a + ;; We quote [&()#$`'] in case their shell is a port of a ;; Unixy shell. We quote [,=+] because stock DOS and ;; Windows shells require that in some cases, such as ;; passing arguments to batch files that use positional ;; arguments like %1. - (not (string-match "[ \t;&()#$',=+]" pattern))) + (not (string-match "[ \t;&()#$`',=+]" pattern))) pattern (let ((result "\"") (beg 0) @@ -6128,7 +6128,7 @@ need to be passed verbatim to shell commands." (concat result (substring pattern beg) "\"")))) (t (let ((beg 0)) - (while (string-match "[ \t\n;<>&|()'\"#$]" pattern beg) + (while (string-match "[ \t\n;<>&|()`'\"#$]" pattern beg) (setq pattern (concat (substring pattern 0 (match-beginning 0)) "\\" |