From 91f50d610e3d6a2338f1752f65574babfe470d62 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 19 May 2002 16:03:51 +0000 Subject: [PATCH] Fix previous change. --- lisp/ChangeLog | 15 +++++++++++++++ lisp/arc-mode.el | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04f8a0aa96f..b102d67a031 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2002-05-19 Richard M. Stallman + + * arc-mode.el (archive-zip-use-pkzip): Variable deleted. + (archive-zip-extract, archive-zip-expunge, archive-zip-update) + (archive-zip-update-case): Use locate-file to decide whether + to use pkzip. + (archive-zip-extract): Test for pkzip in value of archive-zip-extract. + + * files.el (locate-file): Doc fix. + +2002-05-19 John Paul Wallington + + * mail/rmail.el (rmail-show-message-hook): Offer `goto-address' + as an option. + 2002-05-18 Stefan Monnier * uniquify.el (uniquify-rationalize-file-buffer-names): diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index 1792c545029..7265cb09045 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -235,7 +235,7 @@ expected to extract to a file junking the directory part of the name." (defcustom archive-zip-expunge (if (locate-file "zip" nil 'file-executable-p) '("zip" "-d" "-q") - (if (locate-file "zip" nil 'file-executable-p) + (if (locate-file "pkzip" nil 'file-executable-p) '("pkzip" "-d") '("zip" "-d" "-q"))) "*Program and its options to run in order to delete zip file members. @@ -249,7 +249,7 @@ Archive and member names will be added." (defcustom archive-zip-update (if (locate-file "zip" nil 'file-executable-p) '("zip" "-q") - (if (locate-file "zip" nil 'file-executable-p) + (if (locate-file "pkzip" nil 'file-executable-p) '("pkzip" "-u" "-P") '("zip" "-q"))) "*Program and its options to run in order to update a zip file member. @@ -264,7 +264,7 @@ file. Archive and member name will be added." (defcustom archive-zip-update-case (if (locate-file "zip" nil 'file-executable-p) '("zip" "-q" "-k") - (if (locate-file "zip" nil 'file-executable-p) + (if (locate-file "pkzip" 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. -- 2.39.5