[Emacs-diffs] Changes to emacs/lisp/arc-mode.el

[Richard M. Stallman]

Index: emacs/lisp/arc-mode.el
diff -c emacs/lisp/arc-mode.el:1.45 emacs/lisp/arc-mode.el:1.46
*** emacs/lisp/arc-mode.el:1.45 Sun Mar  3 16:44:59 2002
--- emacs/lisp/arc-mode.el      Sun May 19 12:00:48 2002
***************
*** 211,224 ****
  ;; ------------------------------
  ;; Zip archive configuration
  
- (defcustom archive-zip-use-pkzip (memq system-type '(ms-dos windows-nt))
-   "*If non-nil then pkzip option are used instead of zip options.
- Only set to true for msdog systems!"
-   :type 'boolean
-   :group 'archive-zip)
- 
  (defcustom archive-zip-extract
!   (if archive-zip-use-pkzip '("pkunzip" "-e" "-o-") '("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.  If `archive-zip-use-pkzip' is non-nil then this program is
--- 211,222 ----
  ;; ------------------------------
  ;; Zip archive configuration
  
  (defcustom archive-zip-extract
!   (if (locate-file "unzip" nil 'file-executable-p)
!       '("unzip" "-qq" "-c")
!     (if (locate-file "pkunzip" nil 'file-executable-p)
!       '("pkunzip" "-e" "-o-")
!       '("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.  If `archive-zip-use-pkzip' is non-nil then this program is
***************
*** 235,241 ****
  ;; names.
  
  (defcustom archive-zip-expunge
!   (if archive-zip-use-pkzip '("pkzip" "-d") '("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")
--- 233,243 ----
  ;; names.
  
  (defcustom archive-zip-expunge
!   (if (locate-file "zip" nil 'file-executable-p)
!       '("zip" "-d" "-q")
!     (if (locate-file "zip" nil 'file-executable-p)
!        '("pkzip" "-d")
!       '("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")
***************
*** 245,251 ****
    :group 'archive-zip)
  
  (defcustom archive-zip-update
!   (if archive-zip-use-pkzip '("pkzip" "-u" "-P") '("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."
--- 247,257 ----
    :group 'archive-zip)
  
  (defcustom archive-zip-update
!   (if (locate-file "zip" nil 'file-executable-p)
!       '("zip" "-q")
!     (if (locate-file "zip" nil 'file-executable-p)
!        '("pkzip" "-u" "-P")
!       '("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."
***************
*** 256,262 ****
    :group 'archive-zip)
  
  (defcustom archive-zip-update-case
!   (if archive-zip-use-pkzip archive-zip-update '("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."
--- 262,272 ----
    :group 'archive-zip)
  
  (defcustom archive-zip-update-case
!   (if (locate-file "zip" nil 'file-executable-p)
!       '("zip" "-q" "-k")
!     (if (locate-file "zip" nil 'file-executable-p)
!        '("pkzip" "-u" "-P")
!       '("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."
***************
*** 1637,1643 ****
      (apply 'vector (nreverse files))))
  
  (defun archive-zip-extract (archive name)
!   (if archive-zip-use-pkzip
        (archive-*-extract archive name archive-zip-extract)
      (archive-extract-by-stdout archive name archive-zip-extract)))
  
--- 1647,1653 ----
      (apply 'vector (nreverse files))))
  
  (defun archive-zip-extract (archive name)
!   (if (equal (car archive-zip-extract) "pkzip")
        (archive-*-extract archive name archive-zip-extract)
      (archive-extract-by-stdout archive name archive-zip-extract)))