(gud-speedbar-buttons): Follow change to gdb-var-list.

[bpt/emacs.git] / lisp / arc-mode.el

diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 72a5578..abf3899 100644 (file)
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1,8 +1,9 @@
 ;;; arc-mode.el --- simple editing of archives
 
 ;;; arc-mode.el --- simple editing of archives
 

-;; Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.

 
 

-;; Author: Morten Welinder <terra@diku.dk>
+;; Author: Morten Welinder <terra@gnu.org>

 ;; Keywords: archives msdog editing major-mode
 ;; Favourite-brand-of-beer: None, I hate beer.
 
 ;; Keywords: archives msdog editing major-mode
 ;; Favourite-brand-of-beer: None, I hate beer.
 


@@ -20,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the

-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -77,6 +78,12 @@
 ;;
 ;; LZH         A series of (header,file).  Headers are checksummed.  No
 ;;             interaction among members.
 ;;
 ;; LZH         A series of (header,file).  Headers are checksummed.  No
 ;;             interaction among members.

+;;             Headers come in three flavours called level 0, 1 and 2 headers.
+;;             Level 2 header is free of DOS specific restrictions and most
+;;             prevalently used.  Also level 1 and 2 headers consist of base
+;;             and extension headers.  For more details see
+;;             http://homepage1.nifty.com/dangan/en/Content/Program/Java/jLHA/Notes/Notes.html
+;;             http://www.osirusoft.com/joejared/lzhformat.html

 ;;
 ;; ZIP         A series of (lheader,fil) followed by a "central directory"
 ;;             which is a series of (cheader) followed by an end-of-
 ;;
 ;; ZIP         A series of (lheader,fil) followed by a "central directory"
 ;;             which is a series of (cheader) followed by an end-of-


@@ -88,7 +95,7 @@
 ;;             Each member header points to the next.  The archive is
 ;;             terminated by a bogus header with a zero next link.
 ;; -------------------------------------
 ;;             Each member header points to the next.  The archive is
 ;;             terminated by a bogus header with a zero next link.
 ;; -------------------------------------

-;; HOOKS: `foo' means one the the supported archive types.
+;; HOOKS: `foo' means one of the supported archive types.

 ;;
 ;; archive-mode-hook
 ;; archive-foo-mode-hook
 ;;
 ;; archive-mode-hook
 ;; archive-foo-mode-hook


@@ -119,17 +126,13 @@
   "ZOO-specific options to archive."
   :group 'archive)
 
   "ZOO-specific options to archive."
   :group 'archive)
 

-
-(defcustom archive-dos-members t
-  "*If non-nil then recognize member files using ^M^J as line terminator."
-  :type 'boolean
-  :group 'archive)
-

 (defcustom archive-tmpdir
 (defcustom archive-tmpdir

-  (expand-file-name
-   (make-temp-name (if (eq system-type 'ms-dos) "ar" "archive.tmp"))
-   (or (getenv "TMPDIR") (getenv "TMP") "/tmp"))
-  "*Directory for temporary files made by arc-mode.el"
+  ;; make-temp-name is safe here because we use this name
+  ;; to create a directory.
+  (make-temp-name
+   (expand-file-name (if (eq system-type 'ms-dos) "ar" "archive.tmp")
+                    temporary-file-directory))
+  "Directory for temporary files made by `arc-mode.el'."

   :type 'directory
   :group 'archive)
 
   :type 'directory
   :group 'archive)
 


@@ -215,18 +218,14 @@ Archive and member name will be added."
 ;; ------------------------------
 ;; Zip archive configuration
 
 ;; ------------------------------
 ;; 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
 (defcustom archive-zip-extract

-  (if archive-zip-use-pkzip '("pkunzip" "-e") '("unzip" "-qq" "-c"))
+  (if (and (not (executable-find "unzip"))
+           (executable-find "pkunzip"))
+      '("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
   "*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
-expected to extract to a file junking the directory part of the name."
+be added."

   :type '(list (string :tag "Program")
                (repeat :tag "Options"
                        :inline t
   :type '(list (string :tag "Program")
                (repeat :tag "Options"
                        :inline t


@@ -239,7 +238,10 @@ expected to extract to a file junking the directory part of the name."
 ;; names.
 
 (defcustom archive-zip-expunge
 ;; names.
 
 (defcustom archive-zip-expunge

-  (if archive-zip-use-pkzip '("pkzip" "-d") '("zip" "-d" "-q"))
+  (if (and (not (executable-find "zip"))
+           (executable-find "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")
   "*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")


@@ -249,7 +251,10 @@ Archive and member names will be added."
   :group 'archive-zip)
 
 (defcustom archive-zip-update
   :group 'archive-zip)
 
 (defcustom archive-zip-update

-  (if archive-zip-use-pkzip '("pkzip" "-u") '("zip" "-q"))
+  (if (and (not (executable-find "zip"))
+           (executable-find "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."
   "*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."


@@ -260,7 +265,10 @@ file.  Archive and member name will be added."
   :group 'archive-zip)
 
 (defcustom archive-zip-update-case
   :group 'archive-zip)
 
 (defcustom archive-zip-update-case

-  (if archive-zip-use-pkzip archive-zip-update '("zip" "-q" "-k"))
+  (if (and (not (executable-find "zip"))
+           (executable-find "pkzip"))
+      '("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."
   "*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."


@@ -271,9 +279,9 @@ Archive and member name will be added."
   :group 'archive-zip)
 
 (defcustom archive-zip-case-fiddle t
   :group 'archive-zip)
 
 (defcustom archive-zip-case-fiddle t

-  "*If non-nil then zip file members are case fiddled.
-Case fiddling will only happen for members created by a system that
-uses caseless file names."
+  "*If non-nil then zip file members may be down-cased.
+This case fiddling will only happen for members created by a system
+that uses caseless file names."

   :type 'boolean
   :group 'archive-zip)
 ;; ------------------------------
   :type 'boolean
   :group 'archive-zip)
 ;; ------------------------------


@@ -312,42 +320,144 @@ Archive and member name will be added."
 ;; -------------------------------------------------------------------------
 ;; Section: Variables
 
 ;; -------------------------------------------------------------------------
 ;; Section: Variables
 

-(defvar archive-subtype nil "*Symbol describing archive type.")
-(defvar archive-file-list-start nil "*Position of first contents line.")
-(defvar archive-file-list-end nil "*Position just after last contents line.")
-(defvar archive-proper-file-start nil "*Position of real archive's start.")
-(defvar archive-read-only nil "*Non-nil if the archive is read-only on disk.")
-(defvar archive-remote nil "*Non-nil if the archive is outside file system.")
-(defvar archive-local-name nil "*Name of local copy of remote archive.")
-(defvar archive-mode-map nil "*Local keymap for archive mode listings.")
-(defvar archive-file-name-indent nil "*Column where file names start.")
+(defvar archive-subtype nil "Symbol describing archive type.")
+(defvar archive-file-list-start nil "Position of first contents line.")
+(defvar archive-file-list-end nil "Position just after last contents line.")
+(defvar archive-proper-file-start nil "Position of real archive's start.")
+(defvar archive-read-only nil "Non-nil if the archive is read-only on disk.")
+(defvar archive-local-name nil "Name of local copy of remote archive.")
+(defvar archive-mode-map
+  (let ((map (make-keymap)))
+    (suppress-keymap map)
+    (define-key map " " 'archive-next-line)
+    (define-key map "a" 'archive-alternate-display)
+    ;;(define-key map "c" 'archive-copy)
+    (define-key map "d" 'archive-flag-deleted)
+    (define-key map "\C-d" 'archive-flag-deleted)
+    (define-key map "e" 'archive-extract)
+    (define-key map "f" 'archive-extract)
+    (define-key map "\C-m" 'archive-extract)
+    (define-key map "g" 'revert-buffer)
+    (define-key map "h" 'describe-mode)
+    (define-key map "m" 'archive-mark)
+    (define-key map "n" 'archive-next-line)
+    (define-key map "\C-n" 'archive-next-line)
+    (define-key map [down] 'archive-next-line)
+    (define-key map "o" 'archive-extract-other-window)
+    (define-key map "p" 'archive-previous-line)
+    (define-key map "q" 'quit-window)
+    (define-key map "\C-p" 'archive-previous-line)
+    (define-key map [up] 'archive-previous-line)
+    (define-key map "r" 'archive-rename-entry)
+    (define-key map "u" 'archive-unflag)
+    (define-key map "\M-\C-?" 'archive-unmark-all-files)
+    (define-key map "v" 'archive-view)
+    (define-key map "x" 'archive-expunge)
+    (define-key map "\177" 'archive-unflag-backwards)
+    (define-key map "E" 'archive-extract-other-window)
+    (define-key map "M" 'archive-chmod-entry)
+    (define-key map "G" 'archive-chgrp-entry)
+    (define-key map "O" 'archive-chown-entry)
+
+    (if (fboundp 'command-remapping)
+        (progn
+          (define-key map [remap advertised-undo] 'archive-undo)
+          (define-key map [remap undo] 'archive-undo))
+      (substitute-key-definition 'advertised-undo 'archive-undo map global-map)
+      (substitute-key-definition 'undo 'archive-undo map global-map))
+
+    (define-key map
+      (if (featurep 'xemacs) 'button2 [mouse-2]) 'archive-extract)
+
+    (if (featurep 'xemacs)
+        ()                             ; out of luck
+
+      (define-key map [menu-bar immediate]
+        (cons "Immediate" (make-sparse-keymap "Immediate")))
+      (define-key map [menu-bar immediate alternate]
+        '(menu-item "Alternate Display" archive-alternate-display
+          :enable (boundp (archive-name "alternate-display"))
+          :help "Toggle alternate file info display"))
+      (define-key map [menu-bar immediate view]
+        '(menu-item "View This File" archive-view
+          :help "Display file at cursor in View Mode"))
+      (define-key map [menu-bar immediate display]
+        '(menu-item "Display in Other Window" archive-display-other-window
+          :help "Display file at cursor in another window"))
+      (define-key map [menu-bar immediate find-file-other-window]
+        '(menu-item "Find in Other Window" archive-extract-other-window
+          :help "Edit file at cursor in another window"))
+      (define-key map [menu-bar immediate find-file]
+        '(menu-item "Find This File" archive-extract
+          :help "Extract file at cursor and edit it"))
+
+      (define-key map [menu-bar mark]
+        (cons "Mark" (make-sparse-keymap "Mark")))
+      (define-key map [menu-bar mark unmark-all]
+        '(menu-item "Unmark All" archive-unmark-all-files
+          :help "Unmark all marked files"))
+      (define-key map [menu-bar mark deletion]
+        '(menu-item "Flag" archive-flag-deleted
+          :help "Flag file at cursor for deletion"))
+      (define-key map [menu-bar mark unmark]
+        '(menu-item "Unflag" archive-unflag
+          :help "Unmark file at cursor"))
+      (define-key map [menu-bar mark mark]
+        '(menu-item "Mark" archive-mark
+          :help "Mark file at cursor"))
+
+      (define-key map [menu-bar operate]
+        (cons "Operate" (make-sparse-keymap "Operate")))
+      (define-key map [menu-bar operate chown]
+        '(menu-item "Change Owner..." archive-chown-entry
+          :enable (fboundp (archive-name "chown-entry"))
+          :help "Change owner of marked files"))
+      (define-key map [menu-bar operate chgrp]
+        '(menu-item "Change Group..." archive-chgrp-entry
+          :enable (fboundp (archive-name "chgrp-entry"))
+          :help "Change group ownership of marked files"))
+      (define-key map [menu-bar operate chmod]
+        '(menu-item "Change Mode..." archive-chmod-entry
+          :enable (fboundp (archive-name "chmod-entry"))
+          :help "Change mode (permissions) of marked files"))
+      (define-key map [menu-bar operate rename]
+        '(menu-item "Rename to..." archive-rename-entry
+          :enable (fboundp (archive-name "rename-entry"))
+          :help "Rename marked files"))
+      ;;(define-key map [menu-bar operate copy]
+      ;;  '(menu-item "Copy to..." archive-copy))
+      (define-key map [menu-bar operate expunge]
+        '(menu-item "Expunge Marked Files" archive-expunge
+          :help "Delete all flagged files from archive"))
+      map))
+  "Local keymap for archive mode listings.")
+(defvar archive-file-name-indent nil "Column where file names start.")
+
+(defvar archive-remote nil "Non-nil if the archive is outside file system.")
+(make-variable-buffer-local 'archive-remote)
+(put 'archive-remote 'permanent-local t)
+
+(defvar archive-member-coding-system nil "Coding-system of archive member.")
+(make-variable-buffer-local 'archive-member-coding-system)

 
 (defvar archive-alternate-display nil
 
 (defvar archive-alternate-display nil

-  "*Non-nil when alternate information is shown.")
+  "Non-nil when alternate information is shown.")

 (make-variable-buffer-local 'archive-alternate-display)
 (put 'archive-alternate-display 'permanent-local t)
 
 (make-variable-buffer-local 'archive-alternate-display)
 (put 'archive-alternate-display 'permanent-local t)
 

-(defvar archive-superior-buffer nil "*In archive members, points to archive.")
+(defvar archive-superior-buffer nil "In archive members, points to archive.")

 (put 'archive-superior-buffer 'permanent-local t)
 
 (put 'archive-superior-buffer 'permanent-local t)
 

-(defvar archive-subfile-mode nil "*Non-nil in archive member buffers.")
+(defvar archive-subfile-mode nil "Non-nil in archive member buffers.")

 (make-variable-buffer-local 'archive-subfile-mode)
 (put 'archive-subfile-mode 'permanent-local t)
 
 (make-variable-buffer-local 'archive-subfile-mode)
 (put 'archive-subfile-mode 'permanent-local t)
 

-(defvar archive-subfile-dos nil
-  "Negation of `buffer-file-type', which see.")
-(make-variable-buffer-local 'archive-subfile-dos)
-(put 'archive-subfile-dos 'permanent-local t)
-

 (defvar archive-files nil
   "Vector of file descriptors.
 Each descriptor is a vector of the form
  [EXT-FILE-NAME INT-FILE-NAME CASE-FIDDLED MODE ...]")
 (make-variable-buffer-local 'archive-files)
 
 (defvar archive-files nil
   "Vector of file descriptors.
 Each descriptor is a vector of the form
  [EXT-FILE-NAME INT-FILE-NAME CASE-FIDDLED MODE ...]")
 (make-variable-buffer-local 'archive-files)
 

-(defvar archive-lemacs
-  (string-match "\\(Lucid\\|Xemacs\\)" emacs-version)
-  "*Non-nil when running under under Lucid Emacs or Xemacs.")

 ;; -------------------------------------------------------------------------
 ;; Section: Support functions.
 
 ;; -------------------------------------------------------------------------
 ;; Section: Support functions.
 


@@ -355,9 +465,9 @@ Each descriptor is a vector of the form
   (intern (concat "archive-" (symbol-name archive-subtype) "-" suffix)))
 
 (defun archive-l-e (str &optional len)
   (intern (concat "archive-" (symbol-name archive-subtype) "-" suffix)))
 
 (defun archive-l-e (str &optional len)

-  "Convert little endian string/vector to integer.
-Alternatively, first argument may be a buffer position in the current buffer
-in which case a second argument, length, should be supplied."
+  "Convert little endian string/vector STR to integer.
+Alternatively, STR may be a buffer position in the current buffer
+in which case a second argument, length LEN, should be supplied."

   (if (stringp str)
       (setq len (length str))
     (setq str (buffer-substring str (+ str len))))
   (if (stringp str)
       (setq len (length str))
     (setq str (buffer-substring str (+ str len))))


@@ -369,24 +479,25 @@ in which case a second argument, length, should be supplied."
     result))
 
 (defun archive-int-to-mode (mode)
     result))
 
 (defun archive-int-to-mode (mode)

-  "Turn an integer like 0700 (i.e., 448) into a mode string like -rwx------"
-  (let ((str (make-string 10 ?-)))
-    (or (zerop (logand 16384 mode)) (aset str 0 ?d))
-    (or (zerop (logand  8192 mode)) (aset str 0 ?c)) ; completeness
-    (or (zerop (logand   256 mode)) (aset str 1 ?r))
-    (or (zerop (logand   128 mode)) (aset str 2 ?w))
-    (or (zerop (logand    64 mode)) (aset str 3 ?x))
-    (or (zerop (logand    32 mode)) (aset str 4 ?r))
-    (or (zerop (logand    16 mode)) (aset str 5 ?w))
-    (or (zerop (logand     8 mode)) (aset str 6 ?x))
-    (or (zerop (logand     4 mode)) (aset str 7 ?r))
-    (or (zerop (logand     2 mode)) (aset str 8 ?w))
-    (or (zerop (logand     1 mode)) (aset str 9 ?x))
-    (or (zerop (logand  1024 mode)) (aset str 3 (if (zerop (logand 64 mode))
-                                                   ?S ?s)))
-    (or (zerop (logand  2048 mode)) (aset str 6 (if (zerop (logand  8 mode))
-                                                   ?S ?s)))
-    str))
+  "Turn an integer like 0700 (i.e., 448) into a mode string like -rwx------."
+  ;; FIXME: merge with tar-grind-file-mode.
+  (string
+    (if (zerop (logand  8192 mode))
+       (if (zerop (logand 16384 mode)) ?- ?d)
+      ?c) ; completeness
+    (if (zerop (logand   256 mode)) ?- ?r)
+    (if (zerop (logand   128 mode)) ?- ?w)
+    (if (zerop (logand    64 mode))
+       (if (zerop (logand  1024 mode)) ?- ?S)
+      (if (zerop (logand  1024 mode)) ?x ?s))
+    (if (zerop (logand    32 mode)) ?- ?r)
+    (if (zerop (logand    16 mode)) ?- ?w)
+    (if (zerop (logand     8 mode))
+       (if (zerop (logand  2048 mode)) ?- ?S)
+      (if (zerop (logand  2048 mode)) ?x ?s))
+    (if (zerop (logand     4 mode)) ?- ?r)
+    (if (zerop (logand     2 mode)) ?- ?w)
+    (if (zerop (logand     1 mode)) ?- ?x)))

 
 (defun archive-calc-mode (oldmode newmode &optional error)
   "From the integer OLDMODE and the string NEWMODE calculate a new file mode.
 
 (defun archive-calc-mode (oldmode newmode &optional error)
   "From the integer OLDMODE and the string NEWMODE calculate a new file mode.


@@ -451,22 +562,22 @@ the mode is invalid.  If ERROR is nil then nil will be returned."
 (defun archive-dostime (time)
   "Stringify dos packed TIME record."
   (let ((hour (logand (ash time -11) 31))
 (defun archive-dostime (time)
   "Stringify dos packed TIME record."
   (let ((hour (logand (ash time -11) 31))

-        (minute (logand (ash time -5) 53))
+        (minute (logand (ash time -5) 63))

         (second (* 2 (logand time 31)))) ; 2 seconds resolution
     (format "%02d:%02d:%02d" hour minute second)))
 
         (second (* 2 (logand time 31)))) ; 2 seconds resolution
     (format "%02d:%02d:%02d" hour minute second)))
 

-;;(defun archive-unixdate (low high)
-;;  "Stringify unix (LOW HIGH) date."
-;;  (let ((str (current-time-string (cons high low))))
-;;    (format "%s-%s-%s"
-;;         (substring str 8 9)
-;;         (substring str 4 7)
-;;         (substring str 20 24))))
+(defun archive-unixdate (low high)
+  "Stringify Unix (LOW HIGH) date."
+  (let ((str (current-time-string (cons high low))))
+    (format "%s-%s-%s"
+           (substring str 8 10)
+           (substring str 4 7)
+           (substring str 20 24))))

 
 

-;;(defun archive-unixtime (low high)
-;;  "Stringify unix (LOW HIGH) time."
-;;  (let ((str (current-time-string (cons high low))))
-;;    (substring str 11 19)))
+(defun archive-unixtime (low high)
+  "Stringify Unix (LOW HIGH) time."
+  (let ((str (current-time-string (cons high low))))
+    (substring str 11 19)))

 
 (defun archive-get-lineno ()
   (if (>= (point) archive-file-list-start)
 
 (defun archive-get-lineno ()
   (if (>= (point) archive-file-list-start)


@@ -476,7 +587,7 @@ the mode is invalid.  If ERROR is nil then nil will be returned."
 
 (defun archive-get-descr (&optional noerror)
   "Return the descriptor vector for file at point.
 
 (defun archive-get-descr (&optional noerror)
   "Return the descriptor vector for file at point.

-Does not signal an error if optional second argument NOERROR is non-nil."
+Does not signal an error if optional argument NOERROR is non-nil."

   (let ((no (archive-get-lineno)))
     (if (and (>= (point) archive-file-list-start)
              (< no (length archive-files)))
   (let ((no (archive-get-lineno)))
     (if (and (>= (point) archive-file-list-start)
              (< no (length archive-files)))


@@ -510,8 +621,7 @@ archive.
       (funcall default-major-mode)
     (if (and (not force) archive-files) nil
       (let* ((type (archive-find-type))
       (funcall default-major-mode)
     (if (and (not force) archive-files) nil
       (let* ((type (archive-find-type))

-            (typename (copy-sequence (symbol-name type))))
-       (aset typename 0 (upcase (aref typename 0)))
+            (typename (capitalize (symbol-name type))))

        (kill-all-local-variables)
        (make-local-variable 'archive-subtype)
        (setq archive-subtype type)
        (kill-all-local-variables)
        (make-local-variable 'archive-subtype)
        (setq archive-subtype type)


@@ -520,149 +630,59 @@ archive.
        (make-local-variable 'revert-buffer-function)
        (setq revert-buffer-function 'archive-mode-revert)
        (auto-save-mode 0)
        (make-local-variable 'revert-buffer-function)
        (setq revert-buffer-function 'archive-mode-revert)
        (auto-save-mode 0)

-       (make-local-variable 'local-write-file-hooks)
-       (add-hook 'local-write-file-hooks 'archive-write-file)

 
 

-       ;; Real file contents is binary
+       ;; Remote archives are not written by a hook.
+       (if archive-remote nil
+         (add-hook 'write-contents-functions 'archive-write-file nil t))
+

        (make-local-variable 'require-final-newline)
        (setq require-final-newline nil)
        (make-local-variable 'require-final-newline)
        (setq require-final-newline nil)

-       (make-local-variable 'enable-local-variables)
-       (setq enable-local-variables nil)
-       (if (boundp 'default-buffer-file-type)
-           (setq buffer-file-type t))
+       (make-local-variable 'local-enable-local-variables)
+       (setq local-enable-local-variables nil)
+
+       ;; Prevent loss of data when saving the file.
+       (make-local-variable 'file-precious-flag)
+       (setq file-precious-flag t)

 
        (make-local-variable 'archive-read-only)
 
        (make-local-variable 'archive-read-only)

-       (setq archive-read-only (not (file-writable-p (buffer-file-name))))
+       ;; Archives which are inside other archives and whose
+       ;; names are invalid for this OS, can't be written.
+       (setq archive-read-only
+             (or (not (file-writable-p (buffer-file-name)))
+                 (and archive-subfile-mode
+                      (string-match file-name-invalid-regexp
+                                    (aref archive-subfile-mode 0)))))

 
        ;; Should we use a local copy when accessing from outside Emacs?
        (make-local-variable 'archive-local-name)
 
        ;; Should we use a local copy when accessing from outside Emacs?
        (make-local-variable 'archive-local-name)

-       (make-local-variable 'archive-remote)
-       (setq archive-remote (string-match archive-remote-regexp
-                                          (buffer-file-name)))
+
+       ;; An archive can contain another archive whose name is invalid
+       ;; on local filesystem.  Treat such archives as remote.
+       (or archive-remote
+           (setq archive-remote
+                 (or (string-match archive-remote-regexp (buffer-file-name))
+                     (string-match file-name-invalid-regexp
+                                   (buffer-file-name)))))

 
        (setq major-mode 'archive-mode)
        (setq mode-name (concat typename "-Archive"))
        ;; Run archive-foo-mode-hook and archive-mode-hook
 
        (setq major-mode 'archive-mode)
        (setq mode-name (concat typename "-Archive"))
        ;; Run archive-foo-mode-hook and archive-mode-hook

-       (run-hooks (archive-name "mode-hook") 'archive-mode-hook)
+       (run-mode-hooks (archive-name "mode-hook") 'archive-mode-hook)

        (use-local-map archive-mode-map))
 
       (make-local-variable 'archive-proper-file-start)
       (make-local-variable 'archive-file-list-start)
       (make-local-variable 'archive-file-list-end)
       (make-local-variable 'archive-file-name-indent)
        (use-local-map archive-mode-map))
 
       (make-local-variable 'archive-proper-file-start)
       (make-local-variable 'archive-file-list-start)
       (make-local-variable 'archive-file-list-end)
       (make-local-variable 'archive-file-name-indent)

-      (archive-summarize)
+      (archive-summarize nil)

       (setq buffer-read-only t))))
 
 ;; Archive mode is suitable only for specially formatted data.
 (put 'archive-mode 'mode-class 'special)
       (setq buffer-read-only t))))
 
 ;; Archive mode is suitable only for specially formatted data.
 (put 'archive-mode 'mode-class 'special)

-;; -------------------------------------------------------------------------
-;; Section: Key maps
-
-(if archive-mode-map nil
-  (setq archive-mode-map (make-keymap))
-  (suppress-keymap archive-mode-map)
-  (define-key archive-mode-map " " 'archive-next-line)
-  (define-key archive-mode-map "a" 'archive-alternate-display)
-  ;;(define-key archive-mode-map "c" 'archive-copy)
-  (define-key archive-mode-map "d" 'archive-flag-deleted)
-  (define-key archive-mode-map "\C-d" 'archive-flag-deleted)
-  (define-key archive-mode-map "e" 'archive-extract)
-  (define-key archive-mode-map "f" 'archive-extract)
-  (define-key archive-mode-map "\C-m" 'archive-extract)
-  (define-key archive-mode-map "g" 'revert-buffer)
-  (define-key archive-mode-map "h" 'describe-mode)
-  (define-key archive-mode-map "m" 'archive-mark)
-  (define-key archive-mode-map "n" 'archive-next-line)
-  (define-key archive-mode-map "\C-n" 'archive-next-line)
-  (define-key archive-mode-map [down] 'archive-next-line)
-  (define-key archive-mode-map "o" 'archive-extract-other-window)
-  (define-key archive-mode-map "p" 'archive-previous-line)
-  (define-key archive-mode-map "\C-p" 'archive-previous-line)
-  (define-key archive-mode-map [up] 'archive-previous-line)
-  (define-key archive-mode-map "r" 'archive-rename-entry)
-  (define-key archive-mode-map "u" 'archive-unflag)
-  (define-key archive-mode-map "\M-\C-?" 'archive-unmark-all-files)
-  (define-key archive-mode-map "v" 'archive-view)
-  (define-key archive-mode-map "x" 'archive-expunge)
-  (define-key archive-mode-map "\177" 'archive-unflag-backwards)
-  (define-key archive-mode-map "E" 'archive-extract-other-window)
-  (define-key archive-mode-map "M" 'archive-chmod-entry)
-  (define-key archive-mode-map "G" 'archive-chgrp-entry)
-  (define-key archive-mode-map "O" 'archive-chown-entry)
-
-  (if archive-lemacs
-      (progn
-       ;; Not a nice "solution" but it'll have to do
-       (define-key archive-mode-map "\C-xu" 'archive-undo)
-       (define-key archive-mode-map "\C-_" 'archive-undo))
-    (substitute-key-definition 'undo 'archive-undo
-                              archive-mode-map global-map))
-
-  (define-key archive-mode-map
-    (if archive-lemacs 'button2 [mouse-2]) 'archive-mouse-extract)
-
-  (if archive-lemacs
-      ()                               ; out of luck
-    ;; Get rid of the Edit menu bar item to save space.
-    (define-key archive-mode-map [menu-bar edit] 'undefined)
-
-    (define-key archive-mode-map [menu-bar immediate]
-      (cons "Immediate" (make-sparse-keymap "Immediate")))
-    (define-key archive-mode-map [menu-bar immediate alternate]
-      '("Alternate Display" . archive-alternate-display))
-    (put 'archive-alternate-display 'menu-enable
-        '(boundp (archive-name "alternate-display")))
-    (define-key archive-mode-map [menu-bar immediate view]
-      '("View This File" . archive-view))
-    (define-key archive-mode-map [menu-bar immediate display]
-      '("Display in Other Window" . archive-display-other-window))
-    (define-key archive-mode-map [menu-bar immediate find-file-other-window]
-      '("Find in Other Window" . archive-extract-other-window))
-    (define-key archive-mode-map [menu-bar immediate find-file]
-      '("Find This File" . archive-extract))
-
-    (define-key archive-mode-map [menu-bar mark]
-      (cons "Mark" (make-sparse-keymap "Mark")))
-    (define-key archive-mode-map [menu-bar mark unmark-all]
-      '("Unmark All" . archive-unmark-all-files))
-    (define-key archive-mode-map [menu-bar mark deletion]
-      '("Flag" . archive-flag-deleted))
-    (define-key archive-mode-map [menu-bar mark unmark]
-      '("Unflag" . archive-unflag))
-    (define-key archive-mode-map [menu-bar mark mark]
-      '("Mark" . archive-mark))
-
-    (define-key archive-mode-map [menu-bar operate]
-      (cons "Operate" (make-sparse-keymap "Operate")))
-    (define-key archive-mode-map [menu-bar operate chown]
-      '("Change Owner..." . archive-chown-entry))
-    (put 'archive-chown-entry 'menu-enable
-        '(fboundp (archive-name "chown-entry")))
-    (define-key archive-mode-map [menu-bar operate chgrp]
-      '("Change Group..." . archive-chgrp-entry))
-    (put 'archive-chgrp-entry 'menu-enable
-        '(fboundp (archive-name "chgrp-entry")))
-    (define-key archive-mode-map [menu-bar operate chmod]
-      '("Change Mode..." . archive-chmod-entry))
-    (put 'archive-chmod-entry 'menu-enable
-        '(fboundp (archive-name "chmod-entry")))
-    (define-key archive-mode-map [menu-bar operate rename]
-      '("Rename to..." . archive-rename-entry))
-    (put 'archive-rename-entry 'menu-enable
-        '(fboundp (archive-name "rename-entry")))
-    ;;(define-key archive-mode-map [menu-bar operate copy]
-    ;;  '("Copy to..." . archive-copy))
-    (define-key archive-mode-map [menu-bar operate expunge]
-      '("Expunge Marked Files" . archive-expunge))
-  ))
-
-(let* ((item1 '(archive-subfile-mode " Archive"))
-       (item2 '(archive-subfile-dos " Dos"))
-       (items (if (memq system-type '(ms-dos windows-nt))
-                 (list item1) ; msdog has its own indicator
-               (list item1 item2))))
+
+(let ((item1 '(archive-subfile-mode " Archive")))

   (or (member item1 minor-mode-alist)
   (or (member item1 minor-mode-alist)

-      (setq minor-mode-alist (append items minor-mode-alist))))
+      (setq minor-mode-alist (cons item1 minor-mode-alist))))

 ;; -------------------------------------------------------------------------
 (defun archive-find-type ()
   (widen)
 ;; -------------------------------------------------------------------------
 (defun archive-find-type ()
   (widen)


@@ -671,25 +691,30 @@ archive.
   ;; as an archive by other software.
   (let (case-fold-search)
     (cond ((looking-at "[P]K\003\004") 'zip)
   ;; as an archive by other software.
   (let (case-fold-search)
     (cond ((looking-at "[P]K\003\004") 'zip)

-         ((looking-at "..-l[hz][0-9]-") 'lzh)
+         ((looking-at "..-l[hz][0-9ds]-") 'lzh)

          ((looking-at "....................[\334]\247\304\375") 'zoo)
          ((and (looking-at "\C-z")     ; signature too simple, IMHO
                (string-match "\\.[aA][rR][cC]$"
                              (or buffer-file-name (buffer-name))))
           'arc)
          ((looking-at "....................[\334]\247\304\375") 'zoo)
          ((and (looking-at "\C-z")     ; signature too simple, IMHO
                (string-match "\\.[aA][rR][cC]$"
                              (or buffer-file-name (buffer-name))))
           'arc)

-         (t (error "Buffer format not recognized.")))))
+         (t (error "Buffer format not recognized")))))

 ;; -------------------------------------------------------------------------
 ;; -------------------------------------------------------------------------

-(defun archive-summarize ()
+(defun archive-summarize (&optional shut-up)

   "Parse the contents of the archive file in the current buffer.
 Place a dired-like listing on the front;
 then narrow to it, so that only that listing
   "Parse the contents of the archive file in the current buffer.
 Place a dired-like listing on the front;
 then narrow to it, so that only that listing

-is visible (and the real data of the buffer is hidden)."
+is visible (and the real data of the buffer is hidden).
+Optional argument SHUT-UP, if non-nil, means don't print messages
+when parsing the archive."

   (widen)
   (widen)

-  (let (buffer-read-only)
-    (message "Parsing archive file...")
+  (set-buffer-multibyte nil)
+  (let ((inhibit-read-only t))
+    (or shut-up
+       (message "Parsing archive file..."))

     (buffer-disable-undo (current-buffer))
     (setq archive-files (funcall (archive-name "summarize")))
     (buffer-disable-undo (current-buffer))
     (setq archive-files (funcall (archive-name "summarize")))

-    (message "Parsing archive file...done.")
+    (or shut-up
+       (message "Parsing archive file...done."))

     (setq archive-proper-file-start (point-marker))
     (narrow-to-region (point-min) (point))
     (set-buffer-modified-p nil)
     (setq archive-proper-file-start (point-marker))
     (narrow-to-region (point-min) (point))
     (set-buffer-modified-p nil)


@@ -701,11 +726,11 @@ is visible (and the real data of the buffer is hidden)."
   "Recreate the contents listing of an archive."
   (let ((modified (buffer-modified-p))
        (no (archive-get-lineno))
   "Recreate the contents listing of an archive."
   (let ((modified (buffer-modified-p))
        (no (archive-get-lineno))

-       buffer-read-only)
+       (inhibit-read-only t))

     (widen)
     (delete-region (point-min) archive-proper-file-start)
     (widen)
     (delete-region (point-min) archive-proper-file-start)

-    (archive-summarize)
-    (set-buffer-modified-p modified)
+    (archive-summarize t)
+    (restore-buffer-modified-p modified)

     (goto-char archive-file-list-start)
     (archive-next-line no)))
 
     (goto-char archive-file-list-start)
     (archive-next-line no)))
 


@@ -719,23 +744,24 @@ is visible (and the real data of the buffer is hidden)."
    (apply
     (function concat)
     (mapcar
    (apply
     (function concat)
     (mapcar

-     (function 
-      (lambda (fil)
-       ;; Using `concat' here copies the text also, so we can add
-       ;; properties without problems.
-       (let ((text (concat (aref fil 0) "\n")))
-         (if archive-lemacs
-             ()                        ; out of luck
-           (put-text-property (aref fil 1) (aref fil 2)
-                              'mouse-face 'highlight
-                              text))
-         text)))
+     (lambda (fil)
+       ;; Using `concat' here copies the text also, so we can add
+       ;; properties without problems.
+       (let ((text (concat (aref fil 0) "\n")))
+         (if (featurep 'xemacs)
+             ()                         ; out of luck
+           (add-text-properties
+            (aref fil 1) (aref fil 2)
+            '(mouse-face highlight
+              help-echo "mouse-2: extract this file into a buffer")
+            text))
+         text))

      files)))
   (setq archive-file-list-end (point-marker)))
 
 (defun archive-alternate-display ()
   "Toggle alternative display.
      files)))
   (setq archive-file-list-end (point-marker)))
 
 (defun archive-alternate-display ()
   "Toggle alternative display.

-To avoid very long lines some archive mode don't show all information.
+To avoid very long lines archive mode does not show all information.

 This function changes the set of information shown for each files."
   (interactive)
   (setq archive-alternate-display (not archive-alternate-display))
 This function changes the set of information shown for each files."
   (interactive)
   (setq archive-alternate-display (not archive-alternate-display))


@@ -743,32 +769,70 @@ This function changes the set of information shown for each files."
 ;; -------------------------------------------------------------------------
 ;; Section: Local archive copy handling
 
 ;; -------------------------------------------------------------------------
 ;; Section: Local archive copy handling
 

+(defun archive-unique-fname (fname dir)
+  "Make sure a file FNAME can be created uniquely in directory DIR.
+
+If FNAME can be uniquely created in DIR, it is returned unaltered.
+If FNAME is something our underlying filesystem can't grok, or if another
+file by that name already exists in DIR, a unique new name is generated
+using `make-temp-file', and the generated name is returned."
+  (let ((fullname (expand-file-name fname dir))
+       (alien (string-match file-name-invalid-regexp fname)))
+    (if (or alien (file-exists-p fullname))
+       (make-temp-file
+        (expand-file-name
+         (if (if (fboundp 'msdos-long-file-names)
+                 (not (msdos-long-file-names)))
+             "am"
+           "arc-mode.")
+         dir))
+      fullname)))
+

 (defun archive-maybe-copy (archive)
 (defun archive-maybe-copy (archive)

-  (if archive-remote
-      (let ((start (point-max)))
-       (setq archive-local-name (expand-file-name
-                                 (file-name-nondirectory archive)
-                                 archive-tmpdir))
-       (make-directory archive-tmpdir t)
-       (save-restriction
-         (widen)
-         (write-region start (point-max) archive-local-name nil 'nomessage))
-       archive-local-name)
-    (if (buffer-modified-p) (save-buffer))
-    archive))
+  (let ((coding-system-for-write 'no-conversion))
+    (if archive-remote
+       (let ((start (point-max))
+             ;; Sometimes ARCHIVE is invalid while its actual name, as
+             ;; recorded in its parent archive, is not.  For example, an
+             ;; archive bar.zip inside another archive foo.zip gets a name
+             ;; "foo.zip:bar.zip", which is invalid on DOS/Windows.
+             ;; So use the actual name if available.
+             (archive-name
+              (or (and archive-subfile-mode (aref archive-subfile-mode 0))
+                  archive)))
+         (setq archive-local-name
+               (archive-unique-fname archive-name archive-tmpdir))
+         ;; Maked sure all the leading directories in
+         ;; archive-local-name exist under archive-tmpdir, so that
+         ;; the directory structure recorded in the archive is
+         ;; reconstructed in the temporary directory.
+         (make-directory (file-name-directory archive-local-name) t)
+         (save-restriction
+           (widen)
+           (write-region start (point-max) archive-local-name nil 'nomessage))
+         archive-local-name)
+      (if (buffer-modified-p) (save-buffer))
+      archive)))

 
 (defun archive-maybe-update (unchanged)
   (if archive-remote
       (let ((name archive-local-name)
            (modified (buffer-modified-p))
 
 (defun archive-maybe-update (unchanged)
   (if archive-remote
       (let ((name archive-local-name)
            (modified (buffer-modified-p))

-           buffer-read-only)
+           (coding-system-for-read 'no-conversion)
+           (lno (archive-get-lineno))
+           (inhibit-read-only t))

        (if unchanged nil
        (if unchanged nil

+         (setq archive-files nil)

          (erase-buffer)
          (insert-file-contents name)
          (erase-buffer)
          (insert-file-contents name)

-         (archive-mode t))
+         (archive-mode t)
+         (goto-char archive-file-list-start)
+         (archive-next-line lno))

        (archive-delete-local name)
        (if (not unchanged)
        (archive-delete-local name)
        (if (not unchanged)

-           (message "Archive file must be saved for changes to take effect"))
+           (message
+            "Buffer `%s' must be saved for changes to take effect"
+            (buffer-name (current-buffer))))

        (set-buffer-modified-p (or modified (not unchanged))))))
 
 (defun archive-delete-local (name)
        (set-buffer-modified-p (or modified (not unchanged))))))
 
 (defun archive-delete-local (name)


@@ -787,18 +851,47 @@ This function changes the set of information shown for each files."
 ;; -------------------------------------------------------------------------
 ;; Section: Member extraction
 
 ;; -------------------------------------------------------------------------
 ;; Section: Member extraction
 

-(defun archive-mouse-extract (event)
-  "Extract a file whose name you click on."
-  (interactive "e")
-  (mouse-set-point event)
-  (switch-to-buffer
-   (save-excursion
-     (archive-extract)
-     (current-buffer))))
+(defun archive-file-name-handler (op &rest args)
+  (or (eq op 'file-exists-p)
+      (let ((file-name-handler-alist nil))
+       (apply op args))))

 
 

-(defun archive-extract (&optional other-window-p)
+(defun archive-set-buffer-as-visiting-file (filename)
+  "Set the current buffer as if it were visiting FILENAME."
+  (save-excursion
+    (goto-char (point-min))
+    (let ((coding
+          (or coding-system-for-read
+              (and set-auto-coding-function
+                   (save-excursion
+                     (funcall set-auto-coding-function
+                              filename (- (point-max) (point-min)))))
+              ;; dos-w32.el defines find-operation-coding-system for
+              ;; DOS/Windows systems which preserves the coding-system
+              ;; of existing files.  We want it to act here as if the
+              ;; extracted file existed.
+              (let ((file-name-handler-alist
+                     '(("" . archive-file-name-handler))))
+                (car (find-operation-coding-system 'insert-file-contents
+                                                   filename t))))))
+      (if (and (not coding-system-for-read)
+              (not enable-multibyte-characters))
+         (setq coding
+               (coding-system-change-text-conversion coding 'raw-text)))
+      (if (and coding
+              (not (eq coding 'no-conversion)))
+         (decode-coding-region (point-min) (point-max) coding)
+       (setq last-coding-system-used coding))
+      (set-buffer-modified-p nil)
+      (kill-local-variable 'buffer-file-coding-system)
+      (after-insert-file-set-coding (- (point-max) (point-min))))))
+
+(define-obsolete-function-alias 'archive-mouse-extract 'archive-extract "22.1")
+
+(defun archive-extract (&optional other-window-p event)

   "In archive mode, extract this entry of the archive into its own buffer."
   "In archive mode, extract this entry of the archive into its own buffer."

-  (interactive)
+  (interactive (list nil last-input-event))
+  (if event (posn-set-point (event-end event)))

   (let* ((view-p (eq other-window-p 'view))
         (descr (archive-get-descr))
          (ename (aref descr 0))
   (let* ((view-p (eq other-window-p 'view))
         (descr (archive-get-descr))
          (ename (aref descr 0))


@@ -809,76 +902,115 @@ This function changes the set of information shown for each files."
          (arcname (file-name-nondirectory archive))
          (bufname (concat (file-name-nondirectory iname) " (" arcname ")"))
          (extractor (archive-name "extract"))
          (arcname (file-name-nondirectory archive))
          (bufname (concat (file-name-nondirectory iname) " (" arcname ")"))
          (extractor (archive-name "extract"))

-         (read-only-p (or archive-read-only view-p))
+        ;; Members with file names which aren't valid for the
+        ;; underlying filesystem, are treated as read-only.
+         (read-only-p (or archive-read-only
+                         view-p
+                         (string-match file-name-invalid-regexp ename)))
+        (arcfilename (expand-file-name (concat arcname ":" iname)))

          (buffer (get-buffer bufname))
          (just-created nil))
          (buffer (get-buffer bufname))
          (just-created nil))

-      (if buffer
+      (if (and buffer
+              (string= (buffer-file-name buffer) arcfilename))

           nil
        (setq archive (archive-maybe-copy archive))
           nil
        (setq archive (archive-maybe-copy archive))

+       (setq bufname (generate-new-buffer-name bufname))

         (setq buffer (get-buffer-create bufname))
         (setq just-created t)
         (setq buffer (get-buffer-create bufname))
         (setq just-created t)

-        (save-excursion
-          (set-buffer buffer)
-          (setq buffer-file-name
-                (expand-file-name (concat arcname ":" iname)))
+        (with-current-buffer buffer
+          (setq buffer-file-name arcfilename)

           (setq buffer-file-truename
                 (abbreviate-file-name buffer-file-name))
           ;; Set the default-directory to the dir of the superior buffer.
           (setq default-directory arcdir)
           (make-local-variable 'archive-superior-buffer)
           (setq archive-superior-buffer archive-buffer)
           (setq buffer-file-truename
                 (abbreviate-file-name buffer-file-name))
           ;; Set the default-directory to the dir of the superior buffer.
           (setq default-directory arcdir)
           (make-local-variable 'archive-superior-buffer)
           (setq archive-superior-buffer archive-buffer)

-          (make-local-variable 'local-write-file-hooks)
-          (add-hook 'local-write-file-hooks 'archive-write-file-member)
+          (add-hook 'write-file-functions 'archive-write-file-member nil t)

           (setq archive-subfile-mode descr)
           (setq archive-subfile-mode descr)

-         (setq archive-subfile-dos nil)
-         (if (boundp 'default-buffer-file-type)
-             (setq buffer-file-type t))
-         (if (fboundp extractor)
-             (funcall extractor archive ename)
-           (archive-*-extract archive ename (symbol-value extractor)))
-          (if archive-dos-members (archive-check-dos))
-          (goto-char (point-min))
-          (rename-buffer bufname)
-          (setq buffer-read-only read-only-p)
-         (setq buffer-undo-list nil)
-          (set-buffer-modified-p nil)
-         (setq buffer-saved-size (buffer-size))
-          (normal-mode)
-         ;; Just in case an archive occurs inside another archive.
-         (if (eq major-mode 'archive-mode)
-             (setq archive-remote t))
-         (run-hooks 'archive-extract-hooks))
+         (if (and
+              (null
+               (let (;; We may have to encode file name arguement for
+                     ;; external programs.
+                     (coding-system-for-write
+                      (and enable-multibyte-characters
+                           file-name-coding-system))
+                     ;; We read an archive member by no-conversion at
+                     ;; first, then decode appropriately by calling
+                     ;; archive-set-buffer-as-visiting-file later.
+                     (coding-system-for-read 'no-conversion))
+                 (condition-case err
+                     (if (fboundp extractor)
+                         (funcall extractor archive ename)
+                       (archive-*-extract archive ename
+                                          (symbol-value extractor)))
+                   (error
+                    (ding (message "%s" (error-message-string err)))
+                    nil))))
+              just-created)
+             (progn
+               (set-buffer-modified-p nil)
+               (kill-buffer buffer))
+           (archive-set-buffer-as-visiting-file ename)
+           (goto-char (point-min))
+           (rename-buffer bufname)
+           (setq buffer-read-only read-only-p)
+           (setq buffer-undo-list nil)
+           (set-buffer-modified-p nil)
+           (setq buffer-saved-size (buffer-size))
+           (normal-mode)
+           ;; Just in case an archive occurs inside another archive.
+           (when (derived-mode-p 'archive-mode)
+              (setq archive-remote t)
+              (if read-only-p (setq archive-read-only t))
+              ;; We will write out the archive ourselves if it is
+              ;; part of another archive.
+              (remove-hook 'write-contents-functions 'archive-write-file t))
+            (run-hooks 'archive-extract-hooks)
+           (if archive-read-only
+               (message "Note: altering this archive is not implemented."))))

        (archive-maybe-update t))
        (archive-maybe-update t))

-      (if view-p
-         (view-buffer buffer (and just-created 'kill-buffer))
-        (if (eq other-window-p 'display)
-            (display-buffer buffer)
-          (if other-window-p
-              (switch-to-buffer-other-window buffer)
-            (switch-to-buffer buffer))))))
+      (or (not (buffer-name buffer))
+          (cond
+           (view-p (view-buffer buffer (and just-created 'kill-buffer)))
+           ((eq other-window-p 'display) (display-buffer buffer))
+           (other-window-p (switch-to-buffer-other-window buffer))
+           (t (switch-to-buffer buffer))))))

 
 (defun archive-*-extract (archive name command)
   (let* ((default-directory (file-name-as-directory archive-tmpdir))
         (tmpfile (expand-file-name (file-name-nondirectory name)
 
 (defun archive-*-extract (archive name command)
   (let* ((default-directory (file-name-as-directory archive-tmpdir))
         (tmpfile (expand-file-name (file-name-nondirectory name)

-                                   default-directory)))
+                                   default-directory))
+        exit-status success)

     (make-directory (directory-file-name default-directory) t)
     (make-directory (directory-file-name default-directory) t)

-    (apply 'call-process
-          (car command)
-          nil
-          nil
-          nil
-          (append (cdr command) (list archive name)))
-    (insert-file-contents tmpfile)
-    (archive-delete-local tmpfile)))
+    (setq exit-status
+         (apply 'call-process
+                (car command)
+                nil
+                nil
+                nil
+                (append (cdr command) (list archive name))))
+    (cond ((and (numberp exit-status) (= exit-status 0))
+          (if (not (file-exists-p tmpfile))
+              (ding (message "`%s': no such file or directory" tmpfile))
+            (insert-file-contents tmpfile)
+            (setq success t)))
+         ((numberp exit-status)
+          (ding
+           (message "`%s' exited with status %d" (car command) exit-status)))
+         ((stringp exit-status)
+          (ding (message "`%s' aborted: %s" (car command) exit-status)))
+         (t
+          (ding (message "`%s' failed" (car command)))))
+    (archive-delete-local tmpfile)
+    success))

 
 (defun archive-extract-by-stdout (archive name command)
 
 (defun archive-extract-by-stdout (archive name command)

-  (let ((binary-process-output t)) ; for Ms-Dos
-    (apply 'call-process
-          (car command)
-          nil
-          t
-          nil
-          (append (cdr command) (list archive name)))))
+  (apply 'call-process
+        (car command)
+        nil
+        t
+        nil
+        (append (cdr command) (list archive name))))

 
 (defun archive-extract-other-window ()
   "In archive mode, find this member in another window."
 
 (defun archive-extract-other-window ()
   "In archive mode, find this member in another window."


@@ -902,11 +1034,10 @@ This function changes the set of information shown for each files."
          (read-buffer "Buffer containing archive: "
                       ;; Find first archive buffer and suggest that
                       (let ((bufs (buffer-list)))
          (read-buffer "Buffer containing archive: "
                       ;; Find first archive buffer and suggest that
                       (let ((bufs (buffer-list)))

-                        (while (and bufs (not (eq (save-excursion
-                                                    (set-buffer (car bufs))
-                                                    major-mode)
-                                                  'archive-mode)))
-                          (setq bufs (cdr bufs)))
+                        (while (and bufs
+                                     (not (with-current-buffer (car bufs)
+                                            (derived-mode-p 'archive-mode))))
+                           (setq bufs (cdr bufs)))

                         (if bufs
                             (car bufs)
                           (error "There are no archive buffers")))
                         (if bufs
                             (car bufs)
                           (error "There are no archive buffers")))


@@ -915,8 +1046,7 @@ This function changes the set of information shown for each files."
                      (if buffer-file-name
                          (file-name-nondirectory buffer-file-name)
                        ""))))
                      (if buffer-file-name
                          (file-name-nondirectory buffer-file-name)
                        ""))))

-  (save-excursion
-    (set-buffer arcbuf)
+  (with-current-buffer arcbuf

     (or (eq major-mode 'archive-mode)
        (error "Buffer is not an archive buffer"))
     (if archive-read-only
     (or (eq major-mode 'archive-mode)
        (error "Buffer is not an archive buffer"))
     (if archive-read-only


@@ -925,76 +1055,39 @@ This function changes the set of information shown for each files."
       (error "An archive buffer cannot be added to itself"))
   (if (string= name "")
       (error "Archive members may not be given empty names"))
       (error "An archive buffer cannot be added to itself"))
   (if (string= name "")
       (error "Archive members may not be given empty names"))

-  (let ((func (save-excursion (set-buffer arcbuf)
-                             (archive-name "add-new-member")))
+  (let ((func (with-current-buffer arcbuf
+                (archive-name "add-new-member")))

        (membuf (current-buffer)))
     (if (fboundp func)
        (membuf (current-buffer)))
     (if (fboundp func)

-       (save-excursion
-         (set-buffer arcbuf)
+       (with-current-buffer arcbuf

          (funcall func buffer-file-name membuf name))
       (error "Adding a new member is not supported for this archive type"))))
 ;; -------------------------------------------------------------------------
 ;; Section: IO stuff
 
          (funcall func buffer-file-name membuf name))
       (error "Adding a new member is not supported for this archive type"))))
 ;; -------------------------------------------------------------------------
 ;; Section: IO stuff
 

-(defun archive-check-dos (&optional force)
-  "*Possibly handle a buffer with ^M^J terminated lines."
-  (save-restriction
-    (widen)
-    (save-excursion
-      (goto-char (point-min))
-      (setq archive-subfile-dos
-           (or force (not (search-forward-regexp "[^\r]\n" nil t))))
-      (if (boundp 'default-buffer-file-type)
-         (setq buffer-file-type (not archive-subfile-dos)))
-      (if archive-subfile-dos
-          (let ((modified (buffer-modified-p)))
-            (buffer-disable-undo (current-buffer))
-            (goto-char (point-min))
-            (while (search-forward "\r\n" nil t)
-              (replace-match "\n"))
-            (buffer-enable-undo)
-            (set-buffer-modified-p modified))))))
-

 (defun archive-write-file-member ()
 (defun archive-write-file-member ()

-  (if archive-subfile-dos
-      (save-restriction
-       (widen)
-        (save-excursion
-          (goto-char (point-min))
-          ;; We don't want our ^M^J <--> ^J changes to show in the undo list
-          (let ((undo-list buffer-undo-list))
-            (unwind-protect
-                (progn
-                  (setq buffer-undo-list t)
-                  (while (search-forward "\n" nil t)
-                    (replace-match "\r\n"))
-                  (setq archive-subfile-dos nil)
-                 (if (boundp 'default-buffer-file-type)
-                     (setq buffer-file-type t))
-                  ;; OK, we're now have explicit ^M^Js -- save and re-unixfy
-                  (archive-write-file-member))
-              (progn
-                (archive-check-dos t)
-                (setq buffer-undo-list undo-list))))
-          t))
-    (save-excursion
-      (save-restriction
-        (message "Updating archive...")
-        (widen)
-       (let ((writer  (save-excursion (set-buffer archive-superior-buffer)
-                                      (archive-name "write-file-member")))
-             (archive (save-excursion (set-buffer archive-superior-buffer)
-                                      (buffer-file-name))))
-         (if (fboundp writer)
-             (funcall writer archive archive-subfile-mode)
-           (archive-*-write-file-member archive
-                                        archive-subfile-mode
-                                        (symbol-value writer))))
+  (save-excursion
+    (save-restriction
+      (message "Updating archive...")
+      (widen)
+      (let ((writer  (with-current-buffer archive-superior-buffer
+                       (archive-name "write-file-member")))
+           (archive (with-current-buffer archive-superior-buffer
+                       (archive-maybe-copy (buffer-file-name)))))
+       (if (fboundp writer)
+           (funcall writer archive archive-subfile-mode)
+         (archive-*-write-file-member archive
+                                      archive-subfile-mode
+                                      (symbol-value writer)))

        (set-buffer-modified-p nil)
        (set-buffer-modified-p nil)

-        (message "Updating archive...done")
-        (set-buffer archive-superior-buffer)
-        (revert-buffer)
-        t))))
+       (message "Updating archive...done"))
+      (set-buffer archive-superior-buffer)
+      (if (not archive-remote) (revert-buffer) (archive-maybe-update nil))))
+  ;; Restore the value of last-coding-system-used, so that basic-save-buffer
+  ;; won't reset the coding-system of this archive member.
+  (if (local-variable-p 'archive-member-coding-system)
+      (setq last-coding-system-used archive-member-coding-system))
+  t)

 
 (defun archive-*-write-file-member (archive descr command)
   (let* ((ename (aref descr 0))
 
 (defun archive-*-write-file-member (archive descr command)
   (let* ((ename (aref descr 0))


@@ -1004,10 +1097,22 @@ This function changes the set of information shown for each files."
     (unwind-protect
         (progn
           (make-directory (file-name-directory tmpfile) t)
     (unwind-protect
         (progn
           (make-directory (file-name-directory tmpfile) t)

-         (write-region (point-min) (point-max) tmpfile nil 'nomessage)
+         ;; If the member is itself an archive, write it without
+         ;; the dired-like listing we created.
+         (if (eq major-mode 'archive-mode)
+             (archive-write-file tmpfile)
+           (write-region (point-min) (point-max) tmpfile nil 'nomessage))
+         ;; basic-save-buffer needs last-coding-system-used to have
+         ;; the value used to write the file, so save it before any
+         ;; further processing clobbers it (we restore it in
+         ;; archive-write-file-member, above).
+         (setq archive-member-coding-system last-coding-system-used)

          (if (aref descr 3)
              ;; Set the file modes, but make sure we can read it.
              (set-file-modes tmpfile (logior ?\400 (aref descr 3))))
          (if (aref descr 3)
              ;; Set the file modes, but make sure we can read it.
              (set-file-modes tmpfile (logior ?\400 (aref descr 3))))

+         (if enable-multibyte-characters
+             (setq ename
+                   (encode-coding-string ename file-name-coding-system)))

           (let ((exitcode (apply 'call-process
                                  (car command)
                                  nil
           (let ((exitcode (apply 'call-process
                                  (car command)
                                  nil


@@ -1019,10 +1124,12 @@ This function changes the set of information shown for each files."
               (error "Updating was unsuccessful (%S)" exitcode))))
       (archive-delete-local tmpfile))))
 
               (error "Updating was unsuccessful (%S)" exitcode))))
       (archive-delete-local tmpfile))))
 

-(defun archive-write-file ()
+(defun archive-write-file (&optional file)

   (save-excursion
   (save-excursion

-    (write-region archive-proper-file-start (point-max) buffer-file-name nil t)
-    (set-buffer-modified-p nil)
+    (let ((coding-system-for-write 'no-conversion))
+      (write-region archive-proper-file-start (point-max)
+                   (or file buffer-file-name) nil t)
+      (set-buffer-modified-p nil))

     t))
 ;; -------------------------------------------------------------------------
 ;; Section: Marking and unmarking.
     t))
 ;; -------------------------------------------------------------------------
 ;; Section: Marking and unmarking.


@@ -1035,7 +1142,7 @@ With a prefix argument, mark that many files."
   (beginning-of-line)
   (let ((sign (if (>= p 0) +1 -1))
        (modified (buffer-modified-p))
   (beginning-of-line)
   (let ((sign (if (>= p 0) +1 -1))
        (modified (buffer-modified-p))

-        buffer-read-only)
+        (inhibit-read-only t))

     (while (not (zerop p))
       (if (archive-get-descr t)
           (progn
     (while (not (zerop p))
       (if (archive-get-descr t)
           (progn


@@ -1043,33 +1150,33 @@ With a prefix argument, mark that many files."
             (insert type)))
       (forward-line sign)
       (setq p (- p sign)))
             (insert type)))
       (forward-line sign)
       (setq p (- p sign)))

-    (set-buffer-modified-p modified))
+    (restore-buffer-modified-p modified))

   (archive-next-line 0))
 
 (defun archive-unflag (p)
   "In archive mode, un-mark this member if it is marked to be deleted.
 With a prefix argument, un-mark that many files forward."
   (interactive "p")
   (archive-next-line 0))
 
 (defun archive-unflag (p)
   "In archive mode, un-mark this member if it is marked to be deleted.
 With a prefix argument, un-mark that many files forward."
   (interactive "p")

-  (archive-flag-deleted p ? ))
+  (archive-flag-deleted p ?\s))

 
 (defun archive-unflag-backwards (p)
   "In archive mode, un-mark this member if it is marked to be deleted.
 With a prefix argument, un-mark that many members backward."
   (interactive "p")
 
 (defun archive-unflag-backwards (p)
   "In archive mode, un-mark this member if it is marked to be deleted.
 With a prefix argument, un-mark that many members backward."
   (interactive "p")

-  (archive-flag-deleted (- p) ? ))
+  (archive-flag-deleted (- p) ?\s))

 
 (defun archive-unmark-all-files ()
   "Remove all marks."
   (interactive)
   (let ((modified (buffer-modified-p))
 
 (defun archive-unmark-all-files ()
   "Remove all marks."
   (interactive)
   (let ((modified (buffer-modified-p))

-       buffer-read-only)
+       (inhibit-read-only t))

     (save-excursion
       (goto-char archive-file-list-start)
       (while (< (point) archive-file-list-end)
     (save-excursion
       (goto-char archive-file-list-start)
       (while (< (point) archive-file-list-end)

-        (or (= (following-char) ? )
-            (progn (delete-char 1) (insert ? )))
+        (or (= (following-char) ?\s)
+            (progn (delete-char 1) (insert ?\s)))

         (forward-line 1)))
         (forward-line 1)))

-    (set-buffer-modified-p modified)))
+    (restore-buffer-modified-p modified)))

 
 (defun archive-mark (p)
   "In archive mode, mark this member for group operations.
 
 (defun archive-mark (p)
   "In archive mode, mark this member for group operations.


@@ -1105,7 +1212,7 @@ Use \\[archive-unmark-all-files] to remove all marks."
 (defun archive-chmod-entry (new-mode)
   "Change the protection bits associated with all marked or this member.
 The new protection bits can either be specified as an octal number or
 (defun archive-chmod-entry (new-mode)
   "Change the protection bits associated with all marked or this member.
 The new protection bits can either be specified as an octal number or

-as a relative change like \"g+rw\" as for chmod(2)"
+as a relative change like \"g+rw\" as for chmod(2)."

   (interactive "sNew mode (octal or relative): ")
   (if archive-read-only (error "Archive is read-only"))
   (let ((func (archive-name "chmod-entry")))
   (interactive "sNew mode (octal or relative): ")
   (if archive-read-only (error "Archive is read-only"))
   (let ((func (archive-name "chmod-entry")))


@@ -1174,7 +1281,7 @@ as a relative change like \"g+rw\" as for chmod(2)"
         (append (cdr command) (cons archive files))))
 
 (defun archive-rename-entry (newname)
         (append (cdr command) (cons archive files))))
 
 (defun archive-rename-entry (newname)

-  "Change the name associated with this entry in the tar file."
+  "Change the name associated with this entry in the archive file."

   (interactive "sNew name: ")
   (if archive-read-only (error "Archive is read-only"))
   (if (string= newname "")
   (interactive "sNew name: ")
   (if archive-read-only (error "Archive is read-only"))
   (if (string= newname "")


@@ -1183,15 +1290,21 @@ as a relative change like \"g+rw\" as for chmod(2)"
        (descr (archive-get-descr)))
     (if (fboundp func)
         (progn
        (descr (archive-get-descr)))
     (if (fboundp func)
         (progn

-         (funcall func (buffer-file-name) newname descr)
+         (funcall func
+                  (if enable-multibyte-characters
+                      (encode-coding-string newname file-name-coding-system)
+                    newname)
+                  descr)

          (archive-resummarize))
       (error "Renaming is not supported for this archive type"))))
 
 ;; Revert the buffer and recompute the dired-like listing.
          (archive-resummarize))
       (error "Renaming is not supported for this archive type"))))
 
 ;; Revert the buffer and recompute the dired-like listing.

-(defun archive-mode-revert (&optional no-autosave no-confirm)
+(defun archive-mode-revert (&optional no-auto-save no-confirm)

   (let ((no (archive-get-lineno)))
     (setq archive-files nil)
   (let ((no (archive-get-lineno)))
     (setq archive-files nil)

-    (let ((revert-buffer-function nil))
+    (let ((revert-buffer-function nil)
+         (coding-system-for-read 'no-conversion))
+      (set-buffer-multibyte nil)

       (revert-buffer t t))
     (archive-mode)
     (goto-char archive-file-list-start)
       (revert-buffer t t))
     (archive-mode)
     (goto-char archive-file-list-start)


@@ -1201,7 +1314,7 @@ as a relative change like \"g+rw\" as for chmod(2)"
   "Undo in an archive buffer.
 This doesn't recover lost files, it just undoes changes in the buffer itself."
   (interactive)
   "Undo in an archive buffer.
 This doesn't recover lost files, it just undoes changes in the buffer itself."
   (interactive)

-  (let (buffer-read-only)
+  (let ((inhibit-read-only t))

     (undo)))
 ;; -------------------------------------------------------------------------
 ;; Section: Arc Archives
     (undo)))
 ;; -------------------------------------------------------------------------
 ;; Section: Arc Archives


@@ -1253,17 +1366,18 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
              "\n"))
     (apply 'vector (nreverse files))))
 
              "\n"))
     (apply 'vector (nreverse files))))
 

-(defun archive-arc-rename-entry (archive newname descr)
+(defun archive-arc-rename-entry (newname descr)

   (if (string-match "[:\\\\/]" newname)
   (if (string-match "[:\\\\/]" newname)

-      (error "File names in arc files may not contain a path"))
+      (error "File names in arc files must not contain a directory component"))

   (if (> (length newname) 12)
       (error "File names in arc files are limited to 12 characters"))
   (let ((name (concat newname (substring "\0\0\0\0\0\0\0\0\0\0\0\0\0"
                                         (length newname))))
   (if (> (length newname) 12)
       (error "File names in arc files are limited to 12 characters"))
   (let ((name (concat newname (substring "\0\0\0\0\0\0\0\0\0\0\0\0\0"
                                         (length newname))))

-       buffer-read-only)
+       (inhibit-read-only t))

     (save-restriction
       (save-excursion
        (widen)
     (save-restriction
       (save-excursion
        (widen)

+       (set-buffer-multibyte nil)

        (goto-char (+ archive-proper-file-start (aref descr 4) 2))
        (delete-char 13)
        (insert name)))))
        (goto-char (+ archive-proper-file-start (aref descr 4) 2))
        (delete-char 13)
        (insert name)))))


@@ -1276,23 +1390,87 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
        (maxlen 8)
         files
        visual)
        (maxlen 8)
         files
        visual)

-    (while (progn (goto-char p) (looking-at "..-l[hz][0-9]-"))
-      (let* ((hsize   (char-after p))
-             (csize   (archive-l-e (+ p 7) 4))
-             (ucsize  (archive-l-e (+ p 11) 4))
-            (modtime (archive-l-e (+ p 15) 2))
-            (moddate (archive-l-e (+ p 17) 2))
-            (fnlen   (char-after (+ p 21)))
-            (efnname (buffer-substring (+ p 22) (+ p 22 fnlen)))
-            (fiddle  (string= efnname (upcase efnname)))
-             (ifnname (if fiddle (downcase efnname) efnname))
-            (p2      (+ p 22 fnlen))
-            (creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))
-            (mode    (if (= creator ?U) (archive-l-e (+ p2 8) 2) ?\666))
-            (modestr (if mode (archive-int-to-mode mode) "??????????"))
-            (uid     (if (= creator ?U) (archive-l-e (+ p2 10) 2)))
-            (gid     (if (= creator ?U) (archive-l-e (+ p2 12) 2)))
-            (text    (if archive-alternate-display
+    (while (progn (goto-char p)                ;beginning of a base header.
+                 (looking-at "\\(.\\|\n\\)\\(.\\|\n\\)-l[hz][0-9ds]-"))
+      (let* ((hsize   (char-after p))  ;size of the base header (level 0 and 1)
+            (csize   (archive-l-e (+ p 7) 4)) ;size of a compressed file to follow (level 0 and 2),
+                                       ;size of extended headers + the compressed file to follow (level 1).
+             (ucsize  (archive-l-e (+ p 11) 4))        ;size of an uncompressed file.
+            (time1   (archive-l-e (+ p 15) 2)) ;date/time (MSDOS format in level 0, 1 headers
+            (time2   (archive-l-e (+ p 17) 2)) ;and UNIX format in level 2 header.)
+            (hdrlvl  (char-after (+ p 20))) ;header level
+            thsize             ;total header size (base + extensions)
+            fnlen efnname fiddle ifnname width p2
+            neh        ;beginning of next extension header (level 1 and 2)
+            mode modestr uid gid text dir prname
+            gname uname modtime moddate)
+       (if (= hdrlvl 3) (error "can't handle lzh level 3 header type"))
+       (when (or (= hdrlvl 0) (= hdrlvl 1))
+         (setq fnlen   (char-after (+ p 21))) ;filename length
+         (setq efnname (let ((str (buffer-substring (+ p 22) (+ p 22 fnlen)))) ;filename from offset 22
+                       (if file-name-coding-system
+                           (decode-coding-string str file-name-coding-system)
+                         (string-as-multibyte str))))
+         (setq p2      (+ p 22 fnlen))) ;
+       (if (= hdrlvl 1)
+            (setq neh (+ p2 3))         ;specific to level 1 header
+         (if (= hdrlvl 2)
+              (setq neh (+ p 24))))     ;specific to level 2 header
+       (if neh         ;if level 1 or 2 we expect extension headers to follow
+           (let* ((ehsize (archive-l-e neh 2)) ;size of the extension header
+                  (etype (char-after (+ neh 2)))) ;extension type
+             (while (not (= ehsize 0))
+                 (cond
+                ((= etype 1)   ;file name
+                 (let ((i (+ neh 3)))
+                   (while (< i (+ neh ehsize))
+                     (setq efnname (concat efnname (char-to-string (char-after i))))
+                     (setq i (1+ i)))))
+                ((= etype 2)   ;directory name
+                 (let ((i (+ neh 3)))
+                   (while (< i (+ neh ehsize))
+                                   (setq dir (concat dir
+                                                      (if (= (char-after i)
+                                                             255)
+                                                          "/"
+                                                        (char-to-string
+                                                         (char-after i)))))
+                                   (setq i (1+ i)))))
+                ((= etype 80)          ;Unix file permission
+                 (setq mode (archive-l-e (+ neh 3) 2)))
+                ((= etype 81)          ;UNIX file group/user ID
+                 (progn (setq uid (archive-l-e (+ neh 3) 2))
+                        (setq gid (archive-l-e (+ neh 5) 2))))
+                ((= etype 82)          ;UNIX file group name
+                 (let ((i (+ neh 3)))
+                   (while (< i (+ neh ehsize))
+                     (setq gname (concat gname (char-to-string (char-after i))))
+                     (setq i (1+ i)))))
+                ((= etype 83)          ;UNIX file user name
+                 (let ((i (+ neh 3)))
+                   (while (< i (+ neh ehsize))
+                     (setq uname (concat uname (char-to-string (char-after i))))
+                     (setq i (1+ i)))))
+                  )
+               (setq neh (+ neh ehsize))
+               (setq ehsize (archive-l-e neh 2))
+               (setq etype (char-after (+ neh 2))))
+             ;;get total header size for level 1 and 2 headers
+             (setq thsize (- neh p))))
+       (if (= hdrlvl 0)  ;total header size
+           (setq thsize hsize))
+       (setq fiddle  (if efnname (string= efnname (upcase efnname))))
+       (setq ifnname (if fiddle (downcase efnname) efnname))
+       (setq prname (if dir (concat dir ifnname) ifnname))
+       (setq width (if prname (string-width prname) 0))
+       (setq modestr (if mode (archive-int-to-mode mode) "??????????"))
+       (setq moddate (if (= hdrlvl 2)
+                         (archive-unixdate time1 time2) ;level 2 header in UNIX format
+                       (archive-dosdate time2))) ;level 0 and 1 header in DOS format
+       (setq modtime (if (= hdrlvl 2)
+                         (archive-unixtime time1 time2)
+                       (archive-dostime time1)))
+       (setq text    (if archive-alternate-display

                          (format "  %8d  %5S  %5S  %s"
                                  ucsize
                                  (or uid "?")
                          (format "  %8d  %5S  %5S  %s"
                                  ucsize
                                  (or uid "?")


@@ -1301,19 +1479,24 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                        (format "  %10s  %8d  %-11s  %-8s  %s"
                                modestr
                                ucsize
                        (format "  %10s  %8d  %-11s  %-8s  %s"
                                modestr
                                ucsize

-                               (archive-dosdate moddate)
-                               (archive-dostime modtime)
-                               ifnname))))
-        (setq maxlen (max maxlen fnlen)
+                               moddate
+                               modtime
+                               prname)))
+        (setq maxlen (max maxlen width)

              totalsize (+ totalsize ucsize)
              visual (cons (vector text
              totalsize (+ totalsize ucsize)
              visual (cons (vector text

-                                  (- (length text) (length ifnname))
+                                  (- (length text) (length prname))

                                   (length text))
                           visual)
                                   (length text))
                           visual)

-             files (cons (vector efnname ifnname fiddle mode (1- p))
-                          files)
-              p (+ p hsize 2 csize))))
+             files (cons (vector prname ifnname fiddle mode (1- p))
+                          files))
+       (cond ((= hdrlvl 1)
+              (setq p (+ p hsize 2 csize)))
+             ((or (= hdrlvl 2) (= hdrlvl 0))
+              (setq p (+ p thsize 2 csize))))
+       ))

     (goto-char (point-min))
     (goto-char (point-min))

+    (set-buffer-multibyte default-enable-multibyte-characters)

     (let ((dash (concat (if archive-alternate-display
                            "- --------  -----  -----  "
                          "- ----------  --------  -----------  --------  ")
     (let ((dash (concat (if archive-alternate-display
                            "- --------  -----  -----  "
                          "- ----------  --------  -----------  --------  ")


@@ -1348,16 +1531,17 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
            p (1+ p)))
     (logand sum 255)))
 
            p (1+ p)))
     (logand sum 255)))
 

-(defun archive-lzh-rename-entry (archive newname descr)
+(defun archive-lzh-rename-entry (newname descr)

   (save-restriction
     (save-excursion
       (widen)
   (save-restriction
     (save-excursion
       (widen)

+      (set-buffer-multibyte nil)

       (let* ((p        (+ archive-proper-file-start (aref descr 4)))
             (oldhsize (char-after p))
             (oldfnlen (char-after (+ p 21)))
             (newfnlen (length newname))
             (newhsize (+ oldhsize newfnlen (- oldfnlen)))
       (let* ((p        (+ archive-proper-file-start (aref descr 4)))
             (oldhsize (char-after p))
             (oldfnlen (char-after (+ p 21)))
             (newfnlen (length newname))
             (newhsize (+ oldhsize newfnlen (- oldfnlen)))

-            buffer-read-only)
+            (inhibit-read-only t))

        (if (> newhsize 255)
            (error "The file name is too long"))
        (goto-char (+ p 21))
        (if (> newhsize 255)
            (error "The file name is too long"))
        (goto-char (+ p 21))


@@ -1368,17 +1552,17 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
        (insert newhsize (archive-lzh-resum p newhsize))))))
 
 (defun archive-lzh-ogm (newval files errtxt ofs)
        (insert newhsize (archive-lzh-resum p newhsize))))))
 
 (defun archive-lzh-ogm (newval files errtxt ofs)

-  (save-restriction
-    (save-excursion
+  (save-excursion
+    (save-restriction

       (widen)
       (widen)

-      (while files
-       (let* ((fil (car files))
-              (p (+ archive-proper-file-start (aref fil 4)))
+      (set-buffer-multibyte nil)
+      (dolist (fil files)
+       (let* ((p (+ archive-proper-file-start (aref fil 4)))

               (hsize   (char-after p))
               (fnlen   (char-after (+ p 21)))
               (p2      (+ p 22 fnlen))
               (creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))
               (hsize   (char-after p))
               (fnlen   (char-after (+ p 21)))
               (p2      (+ p 22 fnlen))
               (creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0))

-              buffer-read-only)
+              (inhibit-read-only t))

          (if (= creator ?U)
              (progn
                (or (numberp newval)
          (if (= creator ?U)
              (progn
                (or (numberp newval)


@@ -1390,8 +1574,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                (delete-char 1)
                (insert (archive-lzh-resum (1+ p) hsize)))
            (message "Member %s does not have %s field"
                (delete-char 1)
                (insert (archive-lzh-resum (1+ p) hsize)))
            (message "Member %s does not have %s field"

-                    (aref fil 1) errtxt)))
-       (setq files (cdr files))))))
+                    (aref fil 1) errtxt)))))))

 
 (defun archive-lzh-chown-entry (newuid files)
   (archive-lzh-ogm newuid files "an uid" 10))
 
 (defun archive-lzh-chown-entry (newuid files)
   (archive-lzh-ogm newuid files "an uid" 10))


@@ -1402,7 +1585,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 (defun archive-lzh-chmod-entry (newmode files)
   (archive-lzh-ogm
    ;; This should work even though newmode will be dynamically accessed.
 (defun archive-lzh-chmod-entry (newmode files)
   (archive-lzh-ogm
    ;; This should work even though newmode will be dynamically accessed.

-   (function (lambda (old) (archive-calc-mode old newmode t)))
+   (lambda (old) (archive-calc-mode old newmode t))

    files "a unix-style mode" 8))
 ;; -------------------------------------------------------------------------
 ;; Section: Zip Archives
    files "a unix-style mode" 8))
 ;; -------------------------------------------------------------------------
 ;; Section: Zip Archives


@@ -1410,14 +1593,14 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 (defun archive-zip-summarize ()
   (goto-char (- (point-max) (- 22 18)))
   (search-backward-regexp "[P]K\005\006")
 (defun archive-zip-summarize ()
   (goto-char (- (point-max) (- 22 18)))
   (search-backward-regexp "[P]K\005\006")

-  (let ((p (1+ (archive-l-e (+ (point) 16) 4)))
+  (let ((p (+ (point-min) (archive-l-e (+ (point) 16) 4)))

         (maxlen 8)
        (totalsize 0)
         files
        visual)
     (while (string= "PK\001\002" (buffer-substring p (+ p 4)))
       (let* ((creator (char-after (+ p 5)))
         (maxlen 8)
        (totalsize 0)
         files
        visual)
     (while (string= "PK\001\002" (buffer-substring p (+ p 4)))
       (let* ((creator (char-after (+ p 5)))

-            (method  (archive-l-e (+ p 10) 2))
+            ;; (method  (archive-l-e (+ p 10) 2))

              (modtime (archive-l-e (+ p 12) 2))
              (moddate (archive-l-e (+ p 14) 2))
              (ucsize  (archive-l-e (+ p 24) 4))
              (modtime (archive-l-e (+ p 12) 2))
              (moddate (archive-l-e (+ p 14) 2))
              (ucsize  (archive-l-e (+ p 24) 4))


@@ -1425,12 +1608,15 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
              (exlen   (archive-l-e (+ p 30) 2))
              (fclen   (archive-l-e (+ p 32) 2))
              (lheader (archive-l-e (+ p 42) 4))
              (exlen   (archive-l-e (+ p 30) 2))
              (fclen   (archive-l-e (+ p 32) 2))
              (lheader (archive-l-e (+ p 42) 4))

-             (efnname (buffer-substring (+ p 46) (+ p 46 fnlen)))
+             (efnname (let ((str (buffer-substring (+ p 46) (+ p 46 fnlen))))
+                       (if file-name-coding-system
+                           (decode-coding-string str file-name-coding-system)
+                         (string-as-multibyte str))))

             (isdir   (and (= ucsize 0)
                           (string= (file-name-nondirectory efnname) "")))
             (mode    (cond ((memq creator '(2 3)) ; Unix + VMS
                             (archive-l-e (+ p 40) 2))
             (isdir   (and (= ucsize 0)
                           (string= (file-name-nondirectory efnname) "")))
             (mode    (cond ((memq creator '(2 3)) ; Unix + VMS
                             (archive-l-e (+ p 40) 2))

-                           ((memq creator '(0 5 6 7 10 11)) ; Dos etc.
+                           ((memq creator '(0 5 6 7 10 11 15)) ; Dos etc.

                             (logior ?\444
                                     (if isdir (logior 16384 ?\111) 0)
                                     (if (zerop
                             (logior ?\444
                                     (if isdir (logior 16384 ?\111) 0)
                                     (if (zerop


@@ -1439,15 +1625,17 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
                            (t nil)))
             (modestr (if mode (archive-int-to-mode mode) "??????????"))
             (fiddle  (and archive-zip-case-fiddle
                            (t nil)))
             (modestr (if mode (archive-int-to-mode mode) "??????????"))
             (fiddle  (and archive-zip-case-fiddle

-                          (not (not (memq creator '(0 2 4 5 9))))))
+                          (not (not (memq creator '(0 2 4 5 9))))
+                          (string= (upcase efnname) efnname)))

              (ifnname (if fiddle (downcase efnname) efnname))
              (ifnname (if fiddle (downcase efnname) efnname))

+            (width (string-width ifnname))

              (text    (format "  %10s  %8d  %-11s  %-8s  %s"
                              modestr
                               ucsize
                               (archive-dosdate moddate)
                               (archive-dostime modtime)
                               ifnname)))
              (text    (format "  %10s  %8d  %-11s  %-8s  %s"
                              modestr
                               ucsize
                               (archive-dosdate moddate)
                               (archive-dostime modtime)
                               ifnname)))

-        (setq maxlen (max maxlen fnlen)
+        (setq maxlen (max maxlen width)

              totalsize (+ totalsize ucsize)
              visual (cons (vector text
                                   (- (length text) (length ifnname))
              totalsize (+ totalsize ucsize)
              visual (cons (vector text
                                   (- (length text) (length ifnname))


@@ -1475,7 +1663,7 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
     (apply 'vector (nreverse files))))
 
 (defun archive-zip-extract (archive name)
     (apply 'vector (nreverse files))))
 
 (defun archive-zip-extract (archive name)

-  (if archive-zip-use-pkzip
+  (if (equal (car archive-zip-extract) "pkzip")

       (archive-*-extract archive name archive-zip-extract)
     (archive-extract-by-stdout archive name archive-zip-extract)))
 
       (archive-*-extract archive name archive-zip-extract)
     (archive-extract-by-stdout archive name archive-zip-extract)))
 


@@ -1489,24 +1677,24 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
   (save-restriction
     (save-excursion
       (widen)
   (save-restriction
     (save-excursion
       (widen)

-      (while files
-       (let* ((fil (car files))
-              (p (+ archive-proper-file-start (car (aref fil 4))))
+      (set-buffer-multibyte nil)
+      (dolist (fil files)
+       (let* ((p (+ archive-proper-file-start (car (aref fil 4))))

               (creator (char-after (+ p 5)))
               (oldmode (aref fil 3))
               (newval  (archive-calc-mode oldmode newmode t))
               (creator (char-after (+ p 5)))
               (oldmode (aref fil 3))
               (newval  (archive-calc-mode oldmode newmode t))

-              buffer-read-only)
+              (inhibit-read-only t))

          (cond ((memq creator '(2 3)) ; Unix + VMS
                 (goto-char (+ p 40))
                 (delete-char 2)
                 (insert (logand newval 255) (lsh newval -8)))
          (cond ((memq creator '(2 3)) ; Unix + VMS
                 (goto-char (+ p 40))
                 (delete-char 2)
                 (insert (logand newval 255) (lsh newval -8)))

-               ((memq creator '(0 5 6 7 10 11)) ; Dos etc.
+               ((memq creator '(0 5 6 7 10 11 15)) ; Dos etc.

                 (goto-char (+ p 38))
                 (insert (logior (logand (char-after (point)) 254)
                                 (logand (logxor 1 (lsh newval -7)) 1)))
                 (delete-char 1))
                (t (message "Don't know how to change mode for this member"))))
                 (goto-char (+ p 38))
                 (insert (logior (logand (char-after (point)) 254)
                                 (logand (logxor 1 (lsh newval -7)) 1)))
                 (delete-char 1))
                (t (message "Don't know how to change mode for this member"))))

-       (setq files (cdr files))))))
+        ))))

 ;; -------------------------------------------------------------------------
 ;; Section: Zoo Archives
 
 ;; -------------------------------------------------------------------------
 ;; Section: Zoo Archives
 


@@ -1526,27 +1714,31 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
             (dirtype (char-after (+ p 4)))
             (lfnlen  (if (= dirtype 2) (char-after (+ p 56)) 0))
             (ldirlen (if (= dirtype 2) (char-after (+ p 57)) 0))
             (dirtype (char-after (+ p 4)))
             (lfnlen  (if (= dirtype 2) (char-after (+ p 56)) 0))
             (ldirlen (if (= dirtype 2) (char-after (+ p 57)) 0))

-            (fnlen   (+ ldirlen
-                        (if (> lfnlen 0)
-                            (1- lfnlen)
-                          (or (string-match "\0" namefld) 13))))
-            (efnname (concat
-                      (if (> ldirlen 0)
-                          (concat (buffer-substring
-                                   (+ p 58 lfnlen) (+ p 58 lfnlen ldirlen -1))
-                                  "/")
-                        "")
-                      (if (> lfnlen 0)
-                          (buffer-substring (+ p 58) (+ p 58 lfnlen -1))
-                        (substring namefld 0 fnlen))))
+            (fnlen   (or (string-match "\0" namefld) 13))
+            (efnname (let ((str
+                            (concat
+                             (if (> ldirlen 0)
+                                 (concat (buffer-substring
+                                          (+ p 58 lfnlen)
+                                          (+ p 58 lfnlen ldirlen -1))
+                                         "/")
+                               "")
+                             (if (> lfnlen 0)
+                                 (buffer-substring (+ p 58)
+                                                   (+ p 58 lfnlen -1))
+                               (substring namefld 0 fnlen)))))
+                       (if file-name-coding-system
+                           (decode-coding-string str file-name-coding-system)
+                         (string-as-multibyte str))))

             (fiddle  (and (= lfnlen 0) (string= efnname (upcase efnname))))
              (ifnname (if fiddle (downcase efnname) efnname))
             (fiddle  (and (= lfnlen 0) (string= efnname (upcase efnname))))
              (ifnname (if fiddle (downcase efnname) efnname))

+            (width (string-width ifnname))

              (text    (format "  %8d  %-11s  %-8s  %s"
                               ucsize
                               (archive-dosdate moddate)
                               (archive-dostime modtime)
                               ifnname)))
              (text    (format "  %8d  %-11s  %-8s  %s"
                               ucsize
                               (archive-dosdate moddate)
                               (archive-dostime modtime)
                               ifnname)))

-        (setq maxlen (max maxlen fnlen)
+        (setq maxlen (max maxlen width)

              totalsize (+ totalsize ucsize)
              visual (cons (vector text
                                   (- (length text) (length ifnname))
              totalsize (+ totalsize ucsize)
              visual (cons (vector text
                                   (- (length text) (length ifnname))


@@ -1573,6 +1765,11 @@ This doesn't recover lost files, it just undoes changes in the buffer itself."
 (defun archive-zoo-extract (archive name)
   (archive-extract-by-stdout archive name archive-zoo-extract))
 ;; -------------------------------------------------------------------------
 (defun archive-zoo-extract (archive name)
   (archive-extract-by-stdout archive name archive-zoo-extract))
 ;; -------------------------------------------------------------------------

+;; This line was a mistake; it is kept now for compatibility.
+;; rms  15 Oct 98

 (provide 'archive-mode)
 
 (provide 'archive-mode)
 

-;; arc-mode.el ends here.
+(provide 'arc-mode)
+
+;; arch-tag: e5966a01-35ec-4f27-8095-a043a79b457b
+;;; arc-mode.el ends here