Mercurial > emacs
changeset 107267:848000087a55
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 01 Feb 2010 23:55:38 +0000 |
| parents | db99781baf8e (current diff) bdf05c504564 (diff) |
| children | 90dfa01009dd |
| files | |
| diffstat | 2 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Feb 01 21:54:37 2010 +0000 +++ b/lisp/ChangeLog Mon Feb 01 23:55:38 2010 +0000 @@ -1,3 +1,10 @@ +2010-02-01 Juri Linkov <juri@jurta.org> + + * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to + compare with "pkunzip" and "pkzip" instead of only "pkzip". + In the `archive-extract-by-stdout' branch use `shell-quote-argument' + only when (car archive-zip-extract) is "unzip". (Bug#5475) + 2010-02-01 Stefan Monnier <monnier@iro.umontreal.ca> * doc-view.el (doc-view-new-window-function): Be a bit more defensive.
--- a/lisp/arc-mode.el Mon Feb 01 21:54:37 2010 +0000 +++ b/lisp/arc-mode.el Mon Feb 01 23:55:38 2010 +0000 @@ -1782,12 +1782,16 @@ (apply 'vector (nreverse files)))) (defun archive-zip-extract (archive name) - (if (equal (car archive-zip-extract) "pkzip") + (if (member-ignore-case (car archive-zip-extract) '("pkunzip" "pkzip")) (archive-*-extract archive name archive-zip-extract) - ;; unzip expands wildcards in NAME, so we need to quote it. - ;; FIXME: Does pkzip need similar treatment? - (archive-extract-by-stdout archive (shell-quote-argument name) - archive-zip-extract))) + (archive-extract-by-stdout + archive + ;; unzip expands wildcards in NAME, so we need to quote it. + ;; FIXME: Does pkunzip need similar treatment? + (if (equal (car archive-zip-extract) "unzip") + (shell-quote-argument name) + name) + archive-zip-extract))) (defun archive-zip-write-file-member (archive descr) (archive-*-write-file-member