* wl-vars.el (wl-folder-mime-charset-alist): Added @2ch.

* wl-summary.el (wl-summary-goto-top-of-current-thread): New implementation.
(wl-summary-target-mark-thread): Ditto.

* wl-message.el (wl-message-display-internal): Bind elmo-mime-charset.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3903e8b..f208cb4 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,13 @@
+2002-04-16  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-vars.el (wl-folder-mime-charset-alist): Added @2ch.
+
+       * wl-summary.el (wl-summary-goto-top-of-current-thread): New
+       implementation.
+       (wl-summary-target-mark-thread): Ditto.
+
+       * wl-message.el (wl-message-display-internal): Bind elmo-mime-charset.
+
 2002-04-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * wl-util.el (wl-display-bytes): Remove unused function.
@@ -44,7 +54,6 @@
        * wl-addrmgr.el (wl-addrmgr-quit-yes): Call get-buffer-window with
        2nd argument.
 
->>>>>>> 1.489
 2002-03-24  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
        * wl-draft.el (wl-draft-create-contents): Don't take neither
@@ -175,8 +184,8 @@
        * wl-summary.el (wl-summary-next-page): Force display message if
        message is not displayed yet.
        (wl-summary-prev-page): Ditto.
-
-2002-03-11  J\e.A\8e\e,Ai\e(Br\8e\e,At\e(Bme Marant <jerome.marant@free.fr>
+       
+2002-03-11  J\e.A\eNir\eNtme Marant <jerome.marant@free.fr>
 
        * wl-folder.el (wl-folder-mode-menu-spec): Fixed typo.
 

diff --git a/wl/wl-message.el b/wl/wl-message.el
index de5cc18..8df8c87 100644 (file)
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -506,7 +506,8 @@ Returns non-nil if bottom of message."
 
 (defun wl-message-display-internal (folder number flag
                                           &optional force-reload unread)
-  (let ((default-mime-charset wl-mime-charset))
+  (let ((default-mime-charset wl-mime-charset)
+       (elmo-mime-charset wl-mime-charset))
     (setq wl-message-buffer-all-header-flag (eq flag 'all-header))
     (prog1
        (if (eq flag 'as-is)

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 0e5b49e..e5d6ee5 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2710,12 +2710,6 @@ If ARG, without confirm."
        (forward-char))
       (/ depth wl-thread-indent-level-internal))))
 
-(defun wl-summary-goto-bottom-of-current-thread ()
-  (if (re-search-forward (concat "^" wl-summary-buffer-number-regexp
-                                "..../..\(.*\)..:.. [[<]") nil t)
-      ()
-    (goto-char (point-max))))
-
 (defun wl-summary-goto-top-of-current-thread ()
   (wl-summary-jump-to-msg
    (wl-thread-entity-get-number
@@ -3705,17 +3699,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
 
 (defun wl-summary-target-mark-thread ()
   (interactive)
-  (let (beg end)
-    (end-of-line)
-    (wl-summary-goto-top-of-current-thread)
-    (wl-thread-force-open)
-    (setq beg (point))
-    (end-of-line)
-    (wl-summary-goto-bottom-of-current-thread)
-;;; (forward-line -1)
-    (beginning-of-line)
-    (setq end (point))
-    (wl-summary-target-mark-region beg end)))
+  (wl-thread-call-region-func 'wl-summary-target-mark-region t))
 
 (defun wl-summary-target-mark-msgs (msgs)
   "Return the number of marked messages."

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 8fa09c9..3396295 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1752,7 +1752,8 @@ Each elements are regexp of folder name."
     ("^-relcom\\." . koi8-r)
     ("^-tw\\." . big5)
     ("^-han\\." . euc-kr)
-    ("@sponichi" . shift_jis))
+    ("@sponichi" . shift_jis)
+    ("@2ch" . 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