X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-i18n.el;h=484dd36883e55601d970c8c65058ae3846153470;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=3737fb94fd4c3fb675593f09a09c339a668f6ea5;hpb=54ca0f4a40054977cdcb7c1dd4fcf6f0fbf280af;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-i18n.el b/lisp/gnus-i18n.el
index 3737fb9..484dd36 100644
--- a/lisp/gnus-i18n.el
+++ b/lisp/gnus-i18n.el
@@ -20,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Code:
 
@@ -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