[Emacs-diffs] /srv/bzr/emacs/trunk r99433: * arc-mode.el (archive-zip-extract): Use `member-ignore-case' to

[Juri Linkov]

------------------------------------------------------------
revno: 99433
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Tue 2010-02-02 00:35:04 +0200
message:
  * 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)
modified:
  lisp/ChangeLog
  lisp/arc-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-01 18:25:47 +0000
+++ b/lisp/ChangeLog    2010-02-01 22:35:04 +0000
@@ -1,3 +1,10 @@
+2010-02-01  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * doc-view.el (doc-view-new-window-function): Be a bit more defensive.

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2010-01-28 20:06:36 +0000
+++ b/lisp/arc-mode.el  2010-02-01 22:35:04 +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