# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1265068538 0
# Node ID 848000087a55bf7d579ee7ebad0921a877efe355
# Parent  db99781baf8ec6383a6dfa9ab09d616fe9ae8355# Parent  bdf05c5045648d4b6f549a79d3cc078a6cfb3a78
Merge from mainline.

diff -r db99781baf8e -r 848000087a55 lisp/ChangeLog
--- 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.
diff -r db99781baf8e -r 848000087a55 lisp/arc-mode.el
--- 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