Mercurial > emacs
changeset 109277:8591e48339c7
Fix bugs #6144 and #6467.
arc-mode.el (archive-zip-extract): Don't quote the file name on
MS-Windows and MS-DOS. (Bug#6467, Bug#6144)
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 25 Jun 2010 14:42:47 +0300 |
| parents | 3f57ce01b15a |
| children | d14945d39811 |
| files | lisp/ChangeLog lisp/arc-mode.el |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Jun 24 20:30:55 2010 -0400 +++ b/lisp/ChangeLog Fri Jun 25 14:42:47 2010 +0300 @@ -1,3 +1,8 @@ +2010-06-25 Eli Zaretskii <eliz@gnu.org> + + * arc-mode.el (archive-zip-extract): Don't quote the file name on + MS-Windows and MS-DOS. (Bug#6467, Bug#6144) + 2010-06-24 Štěpán Němec <stepnem@gmail.com> (tiny change) * comint.el (make-comint, make-comint-in-buffer): Mention return
--- a/lisp/arc-mode.el Thu Jun 24 20:30:55 2010 -0400 +++ b/lisp/arc-mode.el Fri Jun 25 14:42:47 2010 +0300 @@ -1791,9 +1791,13 @@ (archive-*-extract archive name archive-zip-extract) (archive-extract-by-stdout archive - ;; unzip expands wildcards in NAME, so we need to quote it. + ;; unzip expands wildcards in NAME, so we need to quote it. But + ;; not on DOS/Windows, since that fails extraction on those + ;; systems, and file names with wildcards in zip archives don't + ;; work there anyway. ;; FIXME: Does pkunzip need similar treatment? - (if (equal (car archive-zip-extract) "unzip") + (if (and (not (memq system-type '(windows-nt ms-dos))) + (equal (car archive-zip-extract) "unzip")) (shell-quote-argument name) name) archive-zip-extract)))