[Emacs-diffs] Changes to emacs/lisp/tar-mode.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/tar-mode.el
diff -c emacs/lisp/tar-mode.el:1.92.4.2 emacs/lisp/tar-mode.el:1.92.4.3
*** emacs/lisp/tar-mode.el:1.92.4.2     Fri Apr 16 12:50:10 2004
--- emacs/lisp/tar-mode.el      Thu Oct 14 08:50:01 2004
***************
*** 405,415 ****
  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)."
!   (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
--- 405,416 ----
  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)."
!   (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
***************
*** 417,426 ****
                               (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)))
--- 418,424 ----
                               (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)))
***************
*** 447,453 ****
      ;; 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))
--- 445,451 ----
      ;; 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))