From: yamaoka <yamaoka>
Date: Tue, 12 Nov 2002 23:01:24 +0000 (+0000)
Subject: * gnus-sum.el (gnus-summary-inherit-default-charset): Inherit the value for
X-Git-Tag: t-gnus-6_15_10-00-quimby~97
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29ad960449f01f4b665c64283f7af560ab8ebdd8;p=elisp%2Fgnus.git-

* gnus-sum.el (gnus-summary-inherit-default-charset): Inherit the value for
 `default-mime-charset-unlimited' as well.
(gnus-summary-setup-default-charset): Bind `default-mime-charset-unlimited'
 to nil for nndraft:delayed or nndraft:drafts groups.
---

diff --git a/ChangeLog b/ChangeLog
index f1d4c5e..bf0ab86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2002-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+	* lisp/gnus-sum.el (gnus-summary-inherit-default-charset): Inherit
+	the value for `default-mime-charset-unlimited' as well.
+	(gnus-summary-setup-default-charset): Bind
+	`default-mime-charset-unlimited' to nil for nndraft:delayed or
+	nndraft:drafts groups.
+
 	* lisp/gnus-art.el (gnus-article-prepare-display): Don't use
 	MIME-View for nndraft:delayed or nndraft:drafts groups.
 	(gnus-article-decode-article-as-default-mime-charset): Don't
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 0401206..206c510 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -11127,23 +11127,37 @@ UNREAD is a sorted list."
 ;;;
 
 (defun gnus-summary-inherit-default-charset ()
-  "Import `default-mime-charset' from summary buffer."
+  "Import `default-mime-charset' from summary buffer.
+Also take care of `default-mime-charset-unlimited' if the LIMIT version
+of FLIM is used."
   (if (buffer-live-p gnus-summary-buffer)
-      (if (local-variable-p 'default-mime-charset gnus-summary-buffer)
-	  (progn
-	    (make-local-variable 'default-mime-charset)
-	    (setq default-mime-charset
-		  (with-current-buffer gnus-summary-buffer
-		    default-mime-charset)))
-	(kill-local-variable 'default-mime-charset))))
+      (let (d-m-c d-m-c-u)
+	(with-current-buffer gnus-summary-buffer
+	  (setq d-m-c (if (local-variable-p 'default-mime-charset
+					    gnus-summary-buffer)
+			  default-mime-charset
+			t)
+		;; LIMIT
+		d-m-c-u (if (local-variable-p 'default-mime-charset-unlimited
+					      gnus-summary-buffer)
+			    (symbol-value 'default-mime-charset-unlimited)
+			  t)))
+	(if (eq t d-m-c)
+	    (kill-local-variable 'default-mime-charset)
+	  (set (make-local-variable 'default-mime-charset) d-m-c))
+	(if (eq t d-m-c-u)
+	    (kill-local-variable 'default-mime-charset-unlimited)
+	  (set (make-local-variable 'default-mime-charset-unlimited)
+	       d-m-c-u)))))
 
 (defun gnus-summary-setup-default-charset ()
   "Setup newsgroup default charset."
   (if (member gnus-newsgroup-name '("nndraft:delayed" "nndraft:drafts"))
       (progn
 	(setq gnus-newsgroup-charset nil)
-	(make-local-variable 'default-mime-charset)
-	(setq default-mime-charset nil))
+	(set (make-local-variable 'default-mime-charset) nil)
+	(when (boundp 'default-mime-charset-unlimited);; LIMIT
+	  (set (make-local-variable 'default-mime-charset-unlimited) nil)))
     (let ((ignored-charsets
 	   (or gnus-newsgroup-ephemeral-ignored-charsets
 	       (append