diff options
| author | Eli Zaretskii | 2010-12-10 13:56:44 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2010-12-10 13:56:44 +0200 |
| commit | 72a446736e19bd2caf81006f4e9711bd6c80de41 (patch) | |
| tree | 48de09942a22ee03278ad1a6ec98e58497fce40e | |
| parent | 66f782de2eb1eb3fad467d76a46e847092e2aa5a (diff) | |
| download | emacs-72a446736e19bd2caf81006f4e9711bd6c80de41.tar.gz emacs-72a446736e19bd2caf81006f4e9711bd6c80de41.zip | |
arc-mode.el (archive-zip-extract): If w32-quote-process-args is nil, do quote
archive member names. Suggested by hm <helmut.muelner@joanneum.at>.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/arc-mode.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4043498c2e5..97d78d8070c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-12-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * arc-mode.el (archive-zip-extract): If w32-quote-process-args is | ||
| 4 | nil, do quote archive member names. (Bug#6144) | ||
| 5 | |||
| 1 | 2010-12-10 Glenn Morris <rgm@gnu.org> | 6 | 2010-12-10 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * files.el (diff-no-select): Declare. | 8 | * files.el (diff-no-select): Declare. |
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index a86203a47db..4a80b74e958 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el | |||
| @@ -1813,10 +1813,12 @@ This doesn't recover lost files, it just undoes changes in the buffer itself." | |||
| 1813 | archive | 1813 | archive |
| 1814 | ;; unzip expands wildcards in NAME, so we need to quote it. But | 1814 | ;; unzip expands wildcards in NAME, so we need to quote it. But |
| 1815 | ;; not on DOS/Windows, since that fails extraction on those | 1815 | ;; not on DOS/Windows, since that fails extraction on those |
| 1816 | ;; systems, and file names with wildcards in zip archives don't | 1816 | ;; systems (unless w32-quote-process-args is nil), and file names |
| 1817 | ;; work there anyway. | 1817 | ;; with wildcards in zip archives don't work there anyway. |
| 1818 | ;; FIXME: Does pkunzip need similar treatment? | 1818 | ;; FIXME: Does pkunzip need similar treatment? |
| 1819 | (if (and (not (memq system-type '(windows-nt ms-dos))) | 1819 | (if (and (or (not (memq system-type '(windows-nt ms-dos))) |
| 1820 | (and (boundp 'w32-quote-process-args) | ||
| 1821 | (null w32-quote-process-args))) | ||
| 1820 | (equal (car archive-zip-extract) "unzip")) | 1822 | (equal (car archive-zip-extract) "unzip")) |
| 1821 | (shell-quote-argument name) | 1823 | (shell-quote-argument name) |
| 1822 | name) | 1824 | name) |