Mercurial > emacs
diff lisp/arc-mode.el @ 49238:86973b914660
(archive-arc-rename-entry): Fix error message.
(archive-lzh-summarize): Replace local var `path' with `dir'.
(archive-unique-fname) [!MSDOS]: Avoid byte-compiler warning.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 14 Jan 2003 22:31:30 +0000 |
parents | 05ad80e1c6d2 |
children | 3a18e49975cb |
line wrap: on
line diff
--- a/lisp/arc-mode.el Tue Jan 14 21:53:39 2003 +0000 +++ b/lisp/arc-mode.el Tue Jan 14 22:31:30 2003 +0000 @@ -789,8 +789,8 @@ (if (or alien (file-exists-p fullname)) (make-temp-file (expand-file-name - (if (and (fboundp 'msdos-long-file-names) - (not (msdos-long-file-names))) + (if (if (fboundp 'msdos-long-file-names) + (not (msdos-long-file-names))) "am" "arc-mode.") dir)) @@ -1386,7 +1386,7 @@ (defun archive-arc-rename-entry (archive newname descr) (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" @@ -1426,7 +1426,7 @@ (width (string-width ifnname)) (p2 (+ p 22 fnlen)) (creator (if (>= (- hsize fnlen) 24) (char-after (+ p2 2)) 0)) - mode modestr uid gid text path prname + mode modestr uid gid text dir prname ) (if (= hdrlvl 0) (setq mode (if (= creator ?U) (archive-l-e (+ p2 8) 2) ?\666) @@ -1440,7 +1440,7 @@ (cond ((= etype 2) (let ((i (+ p3 3))) (while (< i (+ p3 hsize)) - (setq path (concat path + (setq dir (concat dir (if (= (char-after i) 255) "/" @@ -1454,7 +1454,7 @@ (setq p3 (+ p3 hsize)) (setq hsize (archive-l-e p3 2)) (setq etype (char-after (+ p3 2))))))) - (setq prname (if path (concat path ifnname) ifnname)) + (setq prname (if dir (concat dir ifnname) ifnname)) (setq modestr (if mode (archive-int-to-mode mode) "??????????")) (setq text (if archive-alternate-display (format " %8d %5S %5S %s"