Synch with Oort Gnus.

[elisp/gnus.git-] / lisp / gnus-i18n.el

diff --git a/lisp/gnus-i18n.el b/lisp/gnus-i18n.el
index 3737fb9..c71b1e2 100644 (file)
--- 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
@@ -76,15 +76,15 @@ It is specified by variable `gnus-newsgroup-default-charset-alist'
                       ))
                   (setq alist (cdr alist)))
                 ))))
-       (when charset
-         (save-excursion
-           (set-buffer gnus-summary-buffer)
-           (make-local-variable 'default-mime-charset)
-           (setq default-mime-charset charset)
-           )
-         (make-local-variable 'default-mime-charset)
-         (setq default-mime-charset charset)
-         ))))
+       (if charset
+           (progn
+             (save-excursion
+               (set-buffer gnus-summary-buffer)
+               (make-local-variable 'default-mime-charset)
+               (setq default-mime-charset charset))
+             (make-local-variable 'default-mime-charset)
+             (setq default-mime-charset charset))
+         (kill-local-variable 'default-mime-charset)))))
 
 
 ;;; @ end