From: teranisi <teranisi>
Date: Thu, 19 Apr 2001 04:53:58 +0000 (+0000)
Subject: * wl-vars.el (wl-folder-mime-charset-alist): Setup default value for
X-Git-Tag: wl-2_6-root^3~39
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2dca383122ffef917fee3679faa3b49aa409ae54;p=elisp%2Fwanderlust.git

* wl-vars.el (wl-folder-mime-charset-alist): Setup default value for
 @sponichi.

* wl-draft.el (wl-draft-insert-current-message): Fixed problem
 when `mail-reply-buffer' is buffer-local variable.
 (Reported by <kita@coe.nttdata.co.jp>).
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 41a994c..91be96f 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-19  Yuuichi Teranishi  <teranisi@gohome.org>
+
+	* wl-vars.el (wl-folder-mime-charset-alist): Setup default value for
+	@sponichi.
+
+	* wl-draft.el (wl-draft-insert-current-message): Fixed problem
+	when `mail-reply-buffer' is buffer-local variable.
+	(Reported by <kita@coe.nttdata.co.jp>).
+
 2001-04-17  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-vars.el (toplevel): Require 'elmo-util.
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 8532318..e398248 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -538,19 +538,21 @@ Reply to author if WITH-ARG is non-nil."
 
 (defun wl-draft-insert-current-message (dummy)
   (interactive)
-  (let (mail-reply-buffer
+  (let (original-buffer
+	mail-reply-buffer
 	mail-citation-hook mail-yank-hooks
 	wl-draft-add-references wl-draft-cite-function)
     (with-current-buffer wl-draft-buffer-cur-summary-buffer
       (with-current-buffer wl-message-buffer
-	(setq mail-reply-buffer (wl-message-get-original-buffer))))
-    (if (zerop
-	    (with-current-buffer mail-reply-buffer
-	      (buffer-size)))
-	(error "No current message")
-      (wl-draft-yank-from-mail-reply-buffer
-       nil
-       wl-ignored-forwarded-headers))))
+	(setq original-buffer (wl-message-get-original-buffer))
+	(if (zerop
+	     (with-current-buffer original-buffer
+	       (buffer-size)))
+	    (error "No current message"))))
+    (setq mail-reply-buffer original-buffer)
+    (wl-draft-yank-from-mail-reply-buffer
+     nil
+     wl-ignored-forwarded-headers)))
 
 (defun wl-draft-insert-get-message (dummy)
   (let ((fld (completing-read
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 137b09b..700bc86 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1552,7 +1552,8 @@ Each elements are regexp of folder name."
   '(("^-alt\\.chinese" . big5)
     ("^-relcom\\." . koi8-r)
     ("^-tw\\." . big5)
-    ("^-han\\." . euc-kr))
+    ("^-han\\." . euc-kr)
+    ("@sponichi" . shift_jis))
   "Charset alist.  If no match, `wl-mime-charset' is used."
   :type '(repeat (cons (regexp :tag "Folder Regexp") (symbol :tag "Charset")))
   :group 'wl-summary