X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-i18n.el;h=c71b1e27ca40f4605aa2056e531f07451ef990a3;hb=36bd162f4f7cd40453b8683e796730836c352b2a;hp=f5167925f82b2ce3357c4d65e6a5c111aa9d4131;hpb=39ee96a457e051d58a87c2a9cff31aa3ae8b6eb2;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-i18n.el b/lisp/gnus-i18n.el
index f516792..c71b1e2 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)
@@ -81,13 +77,13 @@ It is specified by variable `gnus-newsgroup-default-charset-alist'
 		   (setq alist (cdr alist)))
 		 ))))
 	(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))
+	    (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)))))