[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99897: Fix bugs #6144 and #6467.

[Eli Zaretskii]

------------------------------------------------------------
revno: 99897
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Fri 2010-06-25 14:42:47 +0300
message:
  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)
modified:
  lisp/ChangeLog
  lisp/arc-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-24 06:38:09 +0000
+++ b/lisp/ChangeLog    2010-06-25 11:42:47 +0000
@@ -1,3 +1,8 @@
+2010-06-25  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>  (tiny change)
 
        * comint.el (make-comint, make-comint-in-buffer): Mention return

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2010-02-12 19:35:45 +0000
+++ b/lisp/arc-mode.el  2010-06-25 11:42:47 +0000
@@ -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)))