emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r102625: arc-mode.el (archive-zip-ext


From: Eli Zaretskii
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r102625: arc-mode.el (archive-zip-extract): If w32-quote-process-args is nil, do quote
Date: Fri, 10 Dec 2010 13:56:44 +0200
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 102625
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2010-12-10 13:56:44 +0200
message:
   arc-mode.el (archive-zip-extract): If w32-quote-process-args is nil, do quote
   archive member names.  Suggested by hm <address@hidden>.
modified:
  lisp/ChangeLog
  lisp/arc-mode.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-10 03:47:49 +0000
+++ b/lisp/ChangeLog    2010-12-10 11:56:44 +0000
@@ -1,3 +1,8 @@
+2010-12-10  Eli Zaretskii  <address@hidden>
+
+       * arc-mode.el (archive-zip-extract): If w32-quote-process-args is
+       nil, do quote archive member names.  (Bug#6144)
+
 2010-12-10  Glenn Morris  <address@hidden>
 
        * files.el (diff-no-select): Declare.

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2010-11-06 20:23:42 +0000
+++ b/lisp/arc-mode.el  2010-12-10 11:56:44 +0000
@@ -1813,10 +1813,12 @@
      archive
      ;; 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.
+     ;; systems (unless w32-quote-process-args is nil), and file names
+     ;; with wildcards in zip archives don't work there anyway.
      ;; FIXME: Does pkunzip need similar treatment?
-     (if (and (not (memq system-type '(windows-nt ms-dos)))
+     (if (and (or (not (memq system-type '(windows-nt ms-dos)))
+                 (and (boundp 'w32-quote-process-args)
+                      (null w32-quote-process-args)))
              (equal (car archive-zip-extract) "unzip"))
         (shell-quote-argument name)
        name)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]