[Emacs-diffs] /srv/bzr/emacs/trunk r105031: * lisp/arc-mode.el (archive-zip-expunge, archive-zip-update)

[Juri Linkov]

------------------------------------------------------------
revno: 105031
fixes bug(s): http://debbugs.gnu.org/8968
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-08 03:08:53 +0300
message:
  * lisp/arc-mode.el (archive-zip-expunge, archive-zip-update)
  (archive-zip-update-case): Use 7z if found by `executable-find'.
  The order of searching the available programs is the same as in
  `archive-zip-extract'.
modified:
  lisp/ChangeLog
  lisp/arc-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-07 22:41:09 +0000
+++ b/lisp/ChangeLog    2011-07-08 00:08:53 +0000
@@ -1,3 +1,10 @@
+2011-07-08  Juri Linkov  <address@hidden>
+
+       * arc-mode.el (archive-zip-expunge, archive-zip-update)
+       (archive-zip-update-case): Use 7z if found by `executable-find'.
+       The order of searching the available programs is the same as in
+       `archive-zip-extract' (bug#8968).
+
 2011-07-07  Chong Yidong  <address@hidden>
 
        * menu-bar.el (menu-bar-line-wrapping-menu): Revert last change.

=== modified file 'lisp/arc-mode.el'
--- a/lisp/arc-mode.el  2011-07-05 15:31:22 +0000
+++ b/lisp/arc-mode.el  2011-07-08 00:08:53 +0000
@@ -216,10 +216,10 @@
 ;; Zip archive configuration
 
 (defcustom archive-zip-extract
-  (cond ((executable-find "unzip") '("unzip" "-qq" "-c"))
-       ((executable-find "7z") '("7z" "x" "-so"))
+  (cond ((executable-find "unzip")   '("unzip" "-qq" "-c"))
+       ((executable-find "7z")      '("7z" "x" "-so"))
        ((executable-find "pkunzip") '("pkunzip" "-e" "-o-"))
-       (t '("unzip" "-qq" "-c")))
+       (t                           '("unzip" "-qq" "-c")))
   "Program and its options to run in order to extract a zip file member.
 Extraction should happen to standard output.  Archive and member name will
 be added."
@@ -235,44 +235,44 @@
 ;; names.
 
 (defcustom archive-zip-expunge
-  (if (and (not (executable-find "zip"))
-           (executable-find "pkzip"))
-      '("pkzip" "-d")
-    '("zip" "-d" "-q"))
+  (cond ((executable-find "zip")     '("zip" "-d" "-q"))
+       ((executable-find "7z")      '("7z" "d"))
+       ((executable-find "pkzip")   '("pkzip" "-d"))
+       (t                           '("zip" "-d" "-q")))
   "Program and its options to run in order to delete zip file members.
 Archive and member names will be added."
   :type '(list (string :tag "Program")
-               (repeat :tag "Options"
-                       :inline t
-                       (string :format "%v")))
+              (repeat :tag "Options"
+                      :inline t
+                      (string :format "%v")))
   :group 'archive-zip)
 
 (defcustom archive-zip-update
-  (if (and (not (executable-find "zip"))
-           (executable-find "pkzip"))
-      '("pkzip" "-u" "-P")
-    '("zip" "-q"))
+  (cond ((executable-find "zip")     '("zip" "-q"))
+       ((executable-find "7z")      '("7z" "u"))
+       ((executable-find "pkzip")   '("pkzip" "-u" "-P"))
+       (t                           '("zip" "-q")))
   "Program and its options to run in order to update a zip file member.
 Options should ensure that specified directory will be put into the zip
 file.  Archive and member name will be added."
   :type '(list (string :tag "Program")
-               (repeat :tag "Options"
-                       :inline t
-                       (string :format "%v")))
+              (repeat :tag "Options"
+                      :inline t
+                      (string :format "%v")))
   :group 'archive-zip)
 
 (defcustom archive-zip-update-case
-  (if (and (not (executable-find "zip"))
-           (executable-find "pkzip"))
-      '("pkzip" "-u" "-P")
-    '("zip" "-q" "-k"))
+  (cond ((executable-find "zip")     '("zip" "-q" "-k"))
+       ((executable-find "7z")      '("7z" "u"))
+       ((executable-find "pkzip")   '("pkzip" "-u" "-P"))
+       (t                           '("zip" "-q" "-k")))
   "Program and its options to run in order to update a case fiddled zip member.
 Options should ensure that specified directory will be put into the zip file.
 Archive and member name will be added."
   :type '(list (string :tag "Program")
-               (repeat :tag "Options"
-                       :inline t
-                       (string :format "%v")))
+              (repeat :tag "Options"
+                      :inline t
+                      (string :format "%v")))
   :group 'archive-zip)
 
 (defcustom archive-zip-case-fiddle t