From 35991919abe4ee91e18a7bfc736aa4b9e9e7f337 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 24 Mar 1999 05:58:14 +0000 Subject: [PATCH] * gnus-art.el (gnus-article-display-mime-message): Set up the buffer local variable `default-mime-charset' of `gnus-article-buffer' before `mime-display-message' is called. * gnus-i18n.el (gnus-newsgroup-default-charset-alist): Be also matched with the group name which has a method name and/or a foreign server name. (gnus-set-summary-default-charset): Cancel the last change. --- lisp/gnus-art.el | 5 +++-- lisp/gnus-i18n.el | 18 +++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index fef6d90..b67fa90 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1990,12 +1990,13 @@ commands: all-headers gnus-have-all-headers)) (make-local-variable 'default-mime-charset) (setq default-mime-charset charset) + (with-current-buffer (get-buffer-create gnus-article-buffer) + (make-local-variable 'default-mime-charset) + (setq default-mime-charset charset)) (mime-display-message mime-message-structure gnus-article-buffer nil gnus-article-mode-map) (when all-headers (gnus-article-hide-headers nil -1)) - (make-local-variable 'default-mime-charset) - (setq default-mime-charset charset) ) ;; `mime-display-message' changes current buffer to `gnus-article-buffer'. (make-local-variable 'mime-button-mother-dispatcher) diff --git a/lisp/gnus-i18n.el b/lisp/gnus-i18n.el index f516792..7e3f2f3 100644 --- a/lisp/gnus-i18n.el +++ b/lisp/gnus-i18n.el @@ -29,13 +29,13 @@ ;;; (defvar gnus-newsgroup-default-charset-alist - '(("^\\(fj\\|tnn\\|japan\\)\\." . iso-2022-jp-2) - ("^han\\." . euc-kr) - ("^relcom\\." . koi8-r) - ("^alt\\.chinese\\.text\\.big5" . cn-big5) - ("^hk\\(star\\)?\\." . cn-big5) - ("^tw\\." . cn-big5) - ("^alt\\.chinese" . hz-gb-2312) + '(("\\(^\\|:\\)\\(fj\\|tnn\\|japan\\)\\." . iso-2022-jp-2) + ("\\(^\\|:\\)han\\." . euc-kr) + ("\\(^\\|:\\)relcom\\." . koi8-r) + ("\\(^\\|:\\)alt\\.chinese\\.text\\.big5" . cn-big5) + ("\\(^\\|:\\)hk\\(star\\)?\\." . cn-big5) + ("\\(^\\|:\\)tw\\." . cn-big5) + ("\\(^\\|:\\)alt\\.chinese" . hz-gb-2312) ) "Alist of newsgroup patterns vs. corresponding default MIME charset. Each element looks like (REGEXP . SYMBOL). REGEXP is pattern for @@ -69,10 +69,6 @@ It is specified by variable `gnus-newsgroup-default-charset-alist' (set-buffer gnus-summary-buffer) gnus-newsgroup-name)) (alist gnus-newsgroup-default-charset-alist)) - ;; Strip method and foreign server name. - (when (string-match ":" group) - (setq group (substring group (match-end 0))) - ) (while alist (let ((pair (car alist))) (if (string-match (car pair) group) -- 1.7.10.4