From c902281a489e18ad26f95f3f27a374c59fe0f095 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 7 Jun 2005 06:21:29 +0000 Subject: [PATCH] Synch to No Gnus 200506070621. --- lisp/ChangeLog | 5 +++++ lisp/mm-util.el | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5e58a07..e386a36 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-06-07 Katsumi Yamaoka + + * mm-util.el (mm-find-buffer-file-coding-system): Don't examine + charset of tar files. + 2005-06-04 Luc Teirlinck * 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 --- 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 - (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*"))) -- 1.7.10.4