Synch to No Gnus 200506070621.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e58a07..e386a36 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mm-util.el (mm-find-buffer-file-coding-system): Don't examine
+       charset of tar files.
+

 2005-06-04  Luc Teirlinck  <teirllm@auburn.edu>
 
        * gnus-art.el (article-update-date-lapsed): Use `save-match-data'.
 2005-06-04  Luc Teirlinck  <teirllm@auburn.edu>
 
        * gnus-art.el (article-update-date-lapsed): Use `save-match-data'.

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 87e3df3..d365044 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -1065,7 +1065,12 @@ gzip, bzip2, etc. are allowed."
   (unless filename
     (setq filename buffer-file-name))
   (save-excursion
   (unless filename
     (setq filename buffer-file-name))
   (save-excursion

-    (let ((decomp (mm-decompress-buffer filename nil t)))
+    (let ((decomp (unless ;; No worth to examine charset of tar files.
+                     (and filename
+                          (string-match
+                           "\\.\\(?:tar\\.[^.]+\\|tbz\\|tgz\\)\\'"
+                           filename))
+                   (mm-decompress-buffer filename nil t))))

       (when decomp
        (set-buffer (let (default-enable-multibyte-characters)
                      (generate-new-buffer " *temp*")))
       (when decomp
        (set-buffer (let (default-enable-multibyte-characters)
                      (generate-new-buffer " *temp*")))