sync wl-2_4

diff --git a/NEWS b/NEWS
index 90c0aef..639e262 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,11 @@ POP3 folder now saves the status of summary and it improves summary
 update speed. If the variable elmo-pop3-use-uidl is non-nil, UIDL is
 used (Initial setting is t).
 
+*** Emacs 21 support
+Wanderlust has started on supporting Standard Emacs 21.
+Toolbars and icon images can be shown in almost Wanderlust
+frames like XEmacs.
+
 *** biff feature
 Server mailbox is checked periodically.
 If new mail is arrived, Wanderlust changes the biff (icon) on the modeline

diff --git a/NEWS.ja b/NEWS.ja
index 5f96609..bdd0352 100644 (file)
--- a/NEWS.ja
+++ b/NEWS.ja
@@ -31,11 +31,16 @@ POP3 \e$B%U%)%k%@$G%5%^%j$N>uBV$rJ]B8$G$-$k$h$&$K$J$j!"%"%/%;%9$,9bB.2=$5$l$^$7$?
 \e$BJQ?t\e(B elmo-pop3-use-uidl \e$B$,\e(B non-nil \e$B$K@_Dj$5$l$F$$$k$H\e(B UIDL \e$B$r;HMQ$7$^$9\e(B
 (\e$B=i4|@_Dj$O\e(B t)\e$B!#\e(B
 
+*** Emacs 21 \e$B%5%]!<%H\e(B
+Standard Emacs 21 \e$B$N%5%]!<%H$r3+;O$7$^$7$?!#\e(BWanderlust \e$B$N$[$H$s\e(B
+\e$B$I$N%U%l!<%`$K!"\e(BXEmacs \e$B$HF1$8$h$&$K%D!<%k%P!<$d%"%$%3%s2hA|$rI=\e(B
+\e$B<($7$^$9!#\e(B
+
 *** biff \e$B5!G=\e(B
 \e$B0lDj;~4V$*$-$K%5!<%P$K%a!<%k$,FO$$$F$$$k$+3NG'$7$^$9!#\e(B
 \e$BFO$$$F$$$l$P%b!<%I%i%$%s$KI=<($7!"%U%)%k%@0lMw%b!<%I$r99?7$7$^$9!#\e(B
 
-*** expire-hide 
+*** expire-hide
 \e$B5-;v<+BN$O>C$9$3$H$J$/!"%5%^%j$K8+$($k5-;v?t$r0lDj$KJ]$D$3$H$,$G\e(B
 \e$B$-$k$h$&$K$J$j$^$7$?!#$R$H$D$N%U%)%k%@$KBgNL$K5-;v$rN/$a$F$$$k>l\e(B
 \e$B9g$G$b!"B.EYDc2<$rM^$($k$3$H$G$-$^$9!#\e(B

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index d06ce5b..3097faf 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 @documentlanguage ja
 @documentencoding iso-2022-jp
-@set VERSION 2.5.1
+@set VERSION 2.5.2
 @synindex pg cp
 @finalout
 

diff --git a/doc/wl.texi b/doc/wl.texi
index cda56c1..257a138 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 @documentlanguage en
 @documentencoding us-ascii
-@set VERSION 2.5.1
+@set VERSION 2.5.2
 @synindex pg cp
 @finalout
 

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 56d4edc..18a5e5a 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-19  Kenichi OKADA  <okada@opaopa.org>
+
+       * elmo-version.el (elmo-version): Up to 2.5.2.
+
 2000-11-15  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-version.el (elmo-version): Up to 2.5.1.

diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el
index 18ec08c..2ef7746 100644 (file)
--- a/elmo/elmo-version.el
+++ b/elmo/elmo-version.el
@@ -35,7 +35,7 @@
 
 ;; product-define in the first place
 (product-provide 'elmo-version
-  (product-define "ELMO" nil '(2 5 1)))
+  (product-define "ELMO" nil '(2 5 2)))
 
 ;; For APEL 10.2 or earlier.
 (defun-maybe product-version-as-string (product)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index f386c7a..8e27f5a 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,17 @@
+2000-11-19  Kenichi OKADA  <okada@opaopa.org>
+
+       * Version number is increased to 2.5.2.
+
+2000-11-17  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-util.el (toplevel): Don't define wl-biff if `timer-activate'
+       does not exist.
+       (wl-biff-stop): Call `cancel-timer' if timer already exists.
+       (wl-biff-start): Call `timer-activate' if timer already exists.
+
+       * wl-mule.el (wl-message-overload-functions): Call `set-keymap-parent'
+       only when it is bound as function.
+
 2000-11-15  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * Version number is increased to 2.5.1.

diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 8a11d7b..f2b20e7 100644 (file)
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -2049,13 +2049,14 @@ Don't care multi."
 
 (defun wl-folder-guess-mailing-list-by-folder-name (folder)
   "Return ML address guess by FOLDER name's last hierarchy.
-Use `wl-subscribed-mailing-list'.  Don't care multi."
+Use `wl-subscribed-mailing-list'."
   (setq folder (car (elmo-folder-get-primitive-folder-list folder)))
   (when (memq (elmo-folder-get-type folder)
              '(localdir imap4 maildir))
     (let (key mladdress)
       (when (string-match "[^\\./]+$" folder)
-       (setq key (concat "^" (substring folder (match-beginning 0)) "@"))
+       (setq key (regexp-quote
+                  (concat (substring folder (match-beginning 0)) "@")))
        (setq mladdress
              (elmo-string-matched-member
               key wl-subscribed-mailing-list 'case-ignore))

diff --git a/wl/wl-mule.el b/wl/wl-mule.el
index 7ae32fa..76538e6 100644 (file)
--- a/wl/wl-mule.el
+++ b/wl/wl-mule.el
@@ -106,7 +106,8 @@ Special commands:
   (local-set-key [mouse-5] 'wl-message-wheel-up)
   (local-set-key [S-mouse-4] 'wl-message-wheel-down)
   (local-set-key [S-mouse-5] 'wl-message-wheel-up)
-  (set-keymap-parent wl-message-button-map (current-local-map))
+  (if (fboundp 'set-keymap-parent)
+      (set-keymap-parent wl-message-button-map (current-local-map)))
   (define-key wl-message-button-map [mouse-2]
     'wl-message-button-dispatcher))
 

diff --git a/wl/wl-util.el b/wl/wl-util.el
index eeec0e5..5f57d24 100644 (file)
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -747,20 +747,24 @@ that `read' can handle, whenever this is possible."
       (start-itimer wl-biff-timer-name 'wl-biff-check-folders
                    wl-biff-check-interval wl-biff-check-interval))))
 
- ((condition-case nil (require 'timer) (error nil));; FSFmacs 19+
+ ((and (condition-case nil (require 'timer) (error nil));; FSFmacs 19+
+       (fboundp 'timer-activate))
 
   (defun wl-biff-stop ()
-    (put 'wl-biff 'timer nil))
+    (when (get 'wl-biff 'timer)
+      (cancel-timer (get 'wl-biff 'timer))))
 
   (defun wl-biff-start ()
     (require 'timer)
     (when wl-biff-check-folder-list
       (wl-biff-check-folders)
-      (put 'wl-biff 'timer (run-at-time
-                           (timer-next-integral-multiple-of-time
-                            (current-time) wl-biff-check-interval)
-                           wl-biff-check-interval
-                           'wl-biff-event-handler))))
+      (if (get 'wl-biff 'timer)
+         (timer-activate (get 'wl-biff 'timer))
+       (put 'wl-biff 'timer (run-at-time
+                             (timer-next-integral-multiple-of-time
+                              (current-time) wl-biff-check-interval)
+                             wl-biff-check-interval
+                             'wl-biff-event-handler)))))
 
   (defun-maybe timer-next-integral-multiple-of-time (time secs)
     "Yield the next value after TIME that is an integral multiple of SECS.