(gnus-set-summary-default-charset): Sync up with "akr" branch.

diff --git a/lisp/gnus-i18n.el b/lisp/gnus-i18n.el
index 3737fb9..78eeb03 100644 (file)
--- a/lisp/gnus-i18n.el
+++ b/lisp/gnus-i18n.el
@@ -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