[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/tar-mode.el
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/tar-mode.el |
Date: |
Fri, 08 Oct 2004 13:48:54 -0400 |
Index: emacs/lisp/tar-mode.el
diff -c emacs/lisp/tar-mode.el:1.95 emacs/lisp/tar-mode.el:1.96
*** emacs/lisp/tar-mode.el:1.95 Mon Feb 9 05:47:32 2004
--- emacs/lisp/tar-mode.el Fri Oct 8 17:31:51 2004
***************
*** 404,414 ****
then narrow to it, so that only that listing
is visible (and the real data of the buffer is hidden)."
(set-buffer-multibyte nil)
- (message "Parsing tar file...")
(let* ((result '())
(pos (point-min))
! (bs (max 1 (- (buffer-size) 1024))) ; always 2+ empty blocks at end.
! (bs100 (max 1 (/ bs 100)))
tokens)
(while (and (<= (+ pos 512) (point-max))
(not (eq 'empty-tar-block
--- 404,414 ----
then narrow to it, so that only that listing
is visible (and the real data of the buffer is hidden)."
(set-buffer-multibyte nil)
(let* ((result '())
(pos (point-min))
! (progress-reporter
! (make-progress-reporter "Parsing tar file..."
! (point-min) (max 1 (- (buffer-size) 1024))))
tokens)
(while (and (<= (+ pos 512) (point-max))
(not (eq 'empty-tar-block
***************
*** 416,425 ****
(tar-header-block-tokenize
(buffer-substring pos (+ pos 512)))))))
(setq pos (+ pos 512))
! (message "Parsing tar file...%d%%"
! ;(/ (* pos 100) bs) ; this gets round-off lossage
! (/ pos bs100) ; this doesn't
! )
(if (eq (tar-header-link-type tokens) 20)
;; Foo. There's an extra empty block after these.
(setq pos (+ pos 512)))
--- 416,422 ----
(tar-header-block-tokenize
(buffer-substring pos (+ pos 512)))))))
(setq pos (+ pos 512))
! (progress-reporter-update progress-reporter pos)
(if (eq (tar-header-link-type tokens) 20)
;; Foo. There's an extra empty block after these.
(setq pos (+ pos 512)))
***************
*** 446,452 ****
;; A tar file should end with a block or two of nulls,
;; but let's not get a fatal error if it doesn't.
(if (eq tokens 'empty-tar-block)
! (message "Parsing tar file...done")
(message "Warning: premature EOF parsing tar file")))
(save-excursion
(goto-char (point-min))
--- 443,449 ----
;; A tar file should end with a block or two of nulls,
;; but let's not get a fatal error if it doesn't.
(if (eq tokens 'empty-tar-block)
! (progress-reporter-done progress-reporter)
(message "Warning: premature EOF parsing tar file")))
(save-excursion
(goto-char (point-min))
- [Emacs-diffs] Changes to emacs/lisp/tar-mode.el,
Eli Zaretskii <=