* wl-summary.el (wl-summary-pick): Don't bind `elmo-search-mime-charset'.

* wl-vars.el (wl-highlight-message-header-button-alist): Define
default using old backquote style.
(wl-search-mime-charset): Abolished.

* wl-highlight.el (wl-highlight-headers):
Call `point' after `re-search-forward'(for Nemacs).

* wl-summary.el (wl-summary-msgdb-load-async): Follow up the changes
for elmo-imap4.el.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 56488ea..74ce88f 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,18 @@
+2000-08-29  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-summary.el (wl-summary-pick): Don't bind
+       `elmo-search-mime-charset'.
+
+       * wl-vars.el (wl-highlight-message-header-button-alist): Define
+       default using old backquote style.
+       (wl-search-mime-charset): Abolished.
+
+       * wl-highlight.el (wl-highlight-headers):
+       Call `point' after `re-search-forward'(for Nemacs).
+
+       * wl-summary.el (wl-summary-msgdb-load-async): Follow up the changes
+       for elmo-imap4.el.
+
 2000-08-29   Daiki Ueno  <ueno@unixuser.org>
 
        * wl-message.el (wl-mmelmo-message-redisplay): Bind

diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el
index 082261a..dffc78c 100644 (file)
--- a/wl/wl-highlight.el
+++ b/wl/wl-highlight.el
@@ -1011,7 +1011,8 @@ interpreted as cited text.)"
 
 (defun wl-highlight-headers ()
   (let ((beg (point-min))
-       (end (or (save-excursion (re-search-forward "^$" nil t))
+       (end (or (save-excursion (re-search-forward "^$" nil t)
+                                (point))
                 (point-max))))
     (wl-highlight-message beg end nil)
     (wl-highlight-message-add-buttons-to-header beg end)

diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index fb8d72a..31dc8c9 100644 (file)
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -682,18 +682,16 @@ Returns nil if selecting folder was in failure."
           (eq (elmo-folder-get-type folder) 'imap4))
       (let* ((spec (elmo-folder-get-spec folder))
             (session (elmo-imap4-get-session spec))
-            (process (elmo-network-session-process-internal session))
             (mailbox (elmo-imap4-spec-mailbox spec))
-            msgdb response)
+            msgdb response tag)
        (unwind-protect
            (progn
-             (elmo-imap4-send-command process
-                                      (list "select "
-                                            (elmo-imap4-mailbox
-                                             mailbox)))
+             (setq tag (elmo-imap4-send-command session
+                                                (list "select "
+                                                      (elmo-imap4-mailbox
+                                                       mailbox))))
              (setq msgdb (elmo-msgdb-load (elmo-string folder)))
-             (setq response (elmo-imap4-read-response 
-                             process)))
+             (setq response (elmo-imap4-read-response session tag)))
          (if response
              (elmo-imap4-session-set-current-mailbox-internal
               session mailbox)
@@ -3886,7 +3884,6 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
                    (read-from-minibuffer "Value: ")))
           (overview (elmo-msgdb-get-overview wl-summary-buffer-msgdb))
           (number-alist (elmo-msgdb-get-number-alist wl-summary-buffer-msgdb))
-          (elmo-search-mime-charset wl-search-mime-charset)
           server-side-search
           result get-func sum)
       (if delete-marks

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 66c4bbf..e6ad62b 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -1409,11 +1409,6 @@ Each elements are regexp of folder name."
   :type '(repeat (regexp :tag "Folder Regexp"))
   :group 'wl-pref)
 
-(defcustom wl-search-mime-charset 'iso-2022-jp
-  "*MIME Charset for searching message."
-  :type 'symbol
-  :group 'wl-pref)
-
 (defcustom wl-folder-mime-charset-alist
   '(("^-alt\\.chinese" . big5)
     ("^-relcom\\." . koi8-r)
@@ -1828,10 +1823,10 @@ list  : reserved specified permanent marks."
   :group 'wl-highlight)
 
 (defcustom wl-highlight-message-header-button-alist
-  `(("^\\(References\\|Message-Id\\|In-Reply-To\\):" "<[^>]+>"
-     0 wl-message-button-refer-article 0)
-    ("^[^:]+:" "\\(<\\(url: \\)?news:\\([^>\n ]*\\)>\\)"
-     1 wl-message-button-refer-article 3))
+  (` (("^\\(References\\|Message-Id\\|In-Reply-To\\):" "<[^>]+>"
+       0 wl-message-button-refer-article  0)
+      ("^[^:]+:" "\\(<\\(url: \\)?news:\\([^>\n ]*\\)>\\)"
+       1 wl-message-button-refer-article 3)))
   "Alist of headers and regexps to match buttons in message headers."
   :type '(repeat
          (list (regexp :tag "Header")