teranisi [Thu, 5 Apr 2001 04:22:25 +0000 (04:22 +0000)]
* elmo.el (elmo-dop-queue-flush): Added autload setting.
teranisi [Thu, 5 Apr 2001 03:31:47 +0000 (03:31 +0000)]
* elmo-shimbun.el (elmo-shimbun-folder): Added `header-hash' slot.
(elmo-folder-open-internal): Setup `header-hash' slot.
(elmo-shimbun-msgdb-create-entity): Use `header-hash' to get header
information.
(elmo-map-message-fetch): Ditto.
teranisi [Wed, 4 Apr 2001 04:32:57 +0000 (04:32 +0000)]
* WL-ELS (ELMO-MODULES): Removed shimbun related modules;
Add elmo-shimbun only if shimbun is installed.
teranisi [Wed, 4 Apr 2001 04:11:53 +0000 (04:11 +0000)]
* shimbun.el, sb-airs.el, sb-asahi.el, sb-bbdb-ml.el, sb-cnet.el,
sb-fml.el, sb-lump.el, sb-mew.el, sb-mhonarc.el,
sb-netbsd.el, sb-sponichi.el, sb-text.el, sb-wired.el,
sb-xemacs.el, sb-yomiuri.el, sb-zdnet.el, sb-tcup.el: Removed.
* elmo-util.el (elmo-resque-obsolete-variable): Fix.
teranisi [Tue, 3 Apr 2001 05:14:00 +0000 (05:14 +0000)]
Update.
teranisi [Tue, 3 Apr 2001 05:13:14 +0000 (05:13 +0000)]
sb-tcup is added.
teranisi [Tue, 3 Apr 2001 05:12:14 +0000 (05:12 +0000)]
* WL-ELS (ELMO-MODULES): Added sb-tcup.
* sb-airs.el: Added footer.
* shimbun.el (shimbun-article): Define as luna-method.
* sb-tcup.el: New file.
teranisi [Tue, 3 Apr 2001 02:15:52 +0000 (02:15 +0000)]
* wl-expire.el (wl-expire-refile): Fixed.
teranisi [Mon, 2 Apr 2001 22:29:00 +0000 (22:29 +0000)]
* sb-airs.el (toplevel): Require 'sb-mhonarc.
(According to the report from ABE Yasushi <yasushi@indigo.co.jp>)
teranisi [Mon, 2 Apr 2001 11:21:55 +0000 (11:21 +0000)]
Update.
teranisi [Mon, 2 Apr 2001 11:16:23 +0000 (11:16 +0000)]
* wl-vars.el (wl-biff-unnotify-hook): New variable.
* wl-util.el (wl-biff-notify): Run `wl-biff-unnotify-hook' when
biff notification is removed.
* utils/bbdb-wl.el: Applied patch from
Hiroya Murata <lapis-lazuli@pop06.odn.ne.jp> for bbdb 2.33
(X-Mail-Count: 07190, 07195 in the ML);
Added workaround for older version of bbdb.
teranisi [Mon, 2 Apr 2001 10:37:06 +0000 (10:37 +0000)]
* sb-asahi.el (shimbun-index-url): Removed redundant '/' in URL string.
(shimbun-get-headers): Ditto.
teranisi [Mon, 2 Apr 2001 07:36:14 +0000 (07:36 +0000)]
* elmo.el: Moved obsolete variable definitions from
elmo-imap4.el, elmo-nntp.el and elmo-pop3.el.
* sb-asahi.el (shimbun-asahi-groups): Deleted "feneral" and "personal"
groups.
* wl.el (wl): Changed position of `elmo-init'.
teranisi [Mon, 2 Apr 2001 04:46:46 +0000 (04:46 +0000)]
* sb-asahi.el: Follow the page renewal.
teranisi [Mon, 2 Apr 2001 02:42:07 +0000 (02:42 +0000)]
New icon.
teranisi [Mon, 2 Apr 2001 02:41:41 +0000 (02:41 +0000)]
Update.
teranisi [Mon, 2 Apr 2001 02:41:04 +0000 (02:41 +0000)]
* Added `shimbun' feature (EXPERIMENTAL).
* Disconnected operation features are not supported yet.
kaoru [Tue, 20 Mar 2001 19:38:14 +0000 (19:38 +0000)]
* wl-folder.el (wl-folder-write-current-folder): Support petname.
okada [Sun, 11 Mar 2001 06:00:25 +0000 (06:00 +0000)]
* wl-draft.el (wl-draft-do-fcc): Fix for `wl-draft-use-cache'
kaoru [Sun, 11 Mar 2001 01:16:30 +0000 (01:16 +0000)]
* wl-folder.el (wl-folder-guess-mailing-list-by-folder-name):
Fixed `match-beginning' argument mismatch.
yamaoka [Mon, 5 Mar 2001 03:17:43 +0000 (03:17 +0000)]
* wl-demo.el (wl-demo): Reset `tab-width' and `tab-stop-list' to the default
value.
teranisi [Thu, 1 Mar 2001 02:24:06 +0000 (02:24 +0000)]
Update.
teranisi [Thu, 1 Mar 2001 02:02:31 +0000 (02:02 +0000)]
Synch up with main trunk and so on.
teranisi [Wed, 28 Feb 2001 07:36:26 +0000 (07:36 +0000)]
* wl-summary.el (wl-summary-prefetch-msg): Use
`elmo-msgdb-overview-get-entity' instead of `assoc'.
* wl-vars.el: Define *-func as obsolete variable using
`elmo-define-obsolete-variable'.
* wl-message.el (wl-message-buffer-prefetch-threshold): Eliminated.
(wl-message-buffer-prefetch): Use `elmo-message-fetch-threshold'
instead of `wl-message-buffer-prefetch-threshold'.
* elmo-util.el (elmo-resque-obsolete-variable): Use defvaralias if defined.
* mmimap.el (toplevel): Require 'mime-parse and 'static.
(mmimap-parse-parameters-from-list): Define as alias for
`mime-decode-parameter-plist' if it is defined as function.
(mmimap-make-mime-entity): Added argument `number'.
(initialize-instance): Set `number' argument of mmimap-make-mime-entity as 0.
(mime-imap-entity-header-string): Arrange node-id for rfc2060 section.
teranisi [Tue, 27 Feb 2001 22:14:19 +0000 (22:14 +0000)]
* wl-summary.el (wl-summary-buffer-message-redisplay-func): Removed.
* wl-vars.el (wl-cache-prefetch-get-next-func): Ditto.
* wl-draft.el (wl-caesar-region-func): Ditto.
* wl-summary.el (wl-summary-exec-subr): Fixed `copy';
Keep unread status in elmo-folder-move-messages.
(wl-summary-sync-update): Set `wl-summary-buffer-msgdb'.
* elmo.el (elmo-folder-have-subfolder-p): New generic function.
* elmo-mark.el (elmo-folder-have-subfolder-p): Define.
* elmo-internal.el (elmo-folder-list-subfolders): Rewrite.
kaoru [Tue, 27 Feb 2001 15:28:02 +0000 (15:28 +0000)]
Use *-function instead of *-func.
wl-address-init-function
wl-draft-cite-function
wl-draft-queue-flush-send-function
wl-draft-send-function
wl-draft-send-mail-function
wl-draft-send-news-function
wl-expire-archive-get-folder-function
wl-fldmgr-sort-function
wl-folder-completion-function
wl-folder-init-function
wl-generate-mailer-string-function
wl-highlight-signature-search-function
wl-highlight-x-face-function
wl-load-profile-function
wl-message-buffer-prefetch-get-next-function
wl-message-buffer-prefetch-get-next-function
wl-print-buffer-function
wl-ps-print-buffer-function
wl-score-edit-exit-function
wl-summary-buffer-exit-function
wl-summary-buffer-message-redisplay-function
wl-summary-buffer-next-folder-function
wl-summary-buffer-prev-folder-function
wl-summary-from-function
wl-summary-get-petname-function
wl-summary-subject-filter-function
wl-summary-subject-function
teranisi [Tue, 27 Feb 2001 10:43:58 +0000 (10:43 +0000)]
* elmo-maildir.el (elmo-folder-msgdb-create): Fixed.
* elmo-imap4.el (elmo-folder-initialize): Fixed problem
when elmo-imap4-default-authenticate-type is nil.
(elmo-folder-list-subfolders): Ditto
(According to the reported of Bun Mizuhara <mizuhara@acm.org>)
(elmo-imap4-fetch-callback-1-subr): Renamed from
`elmo-imap4-fetch-callback-1' and define as inline function.
(elmo-imap4-fetch-callback-1):
Renamed from `elmo-imap4-fetch-callback'.
(elmo-imap4-parse-fetch): Funcall `elmo-imap4-fetch-callback'.
teranisi [Tue, 27 Feb 2001 08:56:17 +0000 (08:56 +0000)]
* elmo-localdir.el (elmo-folder-expand-msgdb-path): Fixed msgdb path
(To keep compatibility with main trunk).
teranisi [Tue, 27 Feb 2001 07:22:17 +0000 (07:22 +0000)]
Synch up with main trunk and so on.
okada [Mon, 26 Feb 2001 01:37:14 +0000 (01:37 +0000)]
* wl-vars.el (wl-summary-search-parent-by-subject-regexp): Ditto.
okada [Mon, 26 Feb 2001 01:28:09 +0000 (01:28 +0000)]
* wl-summary.el (wl-summary-default-subject-filter): Fix for `Re>'.
kaoru [Sun, 25 Feb 2001 12:02:13 +0000 (12:02 +0000)]
* elmo.el (toplevel): Require 'elmo-version first;
for little `recursive-load-depth' settings.
Fix "ends here" comment.
teranisi [Sat, 24 Feb 2001 01:21:10 +0000 (01:21 +0000)]
Update.
teranisi [Sat, 24 Feb 2001 01:02:48 +0000 (01:02 +0000)]
Synch up with main trunk, implemented elmo-cache-folder, and so on.
teranisi [Thu, 22 Feb 2001 21:50:27 +0000 (21:50 +0000)]
* wl-summary.el (wl-summary-default-get-next-msg): Fix (num => msg).
teranisi [Thu, 22 Feb 2001 09:38:00 +0000 (09:38 +0000)]
* wl-summary.el (wl-summary-default-get-next-msg): Fix.
teranisi [Thu, 22 Feb 2001 06:43:25 +0000 (06:43 +0000)]
Synch up with main trunk.
teranisi [Wed, 21 Feb 2001 08:49:27 +0000 (08:49 +0000)]
Fixed last change...again.
teranisi [Wed, 21 Feb 2001 08:48:14 +0000 (08:48 +0000)]
Fixed last change.
teranisi [Wed, 21 Feb 2001 08:41:54 +0000 (08:41 +0000)]
Synch up with main trunk and so on.
yamaoka [Tue, 20 Feb 2001 22:28:50 +0000 (22:28 +0000)]
* wl-demo.el (wl-demo-image-type-alist): Use ' instead of `.
okada [Tue, 20 Feb 2001 12:59:58 +0000 (12:59 +0000)]
synch up with main trunk
yamaoka [Tue, 20 Feb 2001 09:21:14 +0000 (09:21 +0000)]
* wl-e21.el (wl-e21-setup-draft-toolbar): Don't refer to `wl-use-toolbar' nor
`display-graphic-p'.
(wl-e21-setup-message-toolbar): Ditto.
(wl-e21-setup-summary-toolbar): Ditto.
(wl-e21-setup-folder-toolbar): Ditto.
(wl-biff-init-icons): Rewrite using `wl-e21-display-image-p'.
(wl-plugged-init-icons): Ditto.
(wl-folder-init-icons): Use `wl-e21-display-image-p' instead of
`display-graphic-p'.
(wl-plugged-set-folder-icon): Ditto.
(wl-highlight-plugged-current-line): Ditto.
(wl-highlight-folder-current-line): Ditto.
(wl-e21-highlight-folder-group-line): Ditto.
(wl-e21-setup-toolbar): Ditto.
(wl-e21-display-image-p): New macro.
* wl-demo.el (wl-demo): Simplified.
(wl-demo-image-type-alist): Use `image-type-available-p' for checking whether
the image type `xbm' is available.
teranisi [Tue, 20 Feb 2001 03:41:11 +0000 (03:41 +0000)]
Update.
teranisi [Tue, 20 Feb 2001 03:38:17 +0000 (03:38 +0000)]
Synch up with main trunk and so on.
teranisi [Tue, 20 Feb 2001 02:05:40 +0000 (02:05 +0000)]
Process crosspost and so on.
yamaoka [Tue, 20 Feb 2001 02:02:03 +0000 (02:02 +0000)]
* wl-e21.el (wl-highlight-folder-current-line): Call `wl-folder-init-icons'
when folder icons have not been initialized.
yamaoka [Tue, 20 Feb 2001 01:34:17 +0000 (01:34 +0000)]
* wl-vars.el (wl-demo-display-logo): Add `bitmap' to the selection.
* wl-demo.el: Work also with BITMAP-MULE under Emacs 21.
yamaoka [Mon, 19 Feb 2001 11:08:58 +0000 (11:08 +0000)]
Typo.
yamaoka [Mon, 19 Feb 2001 11:05:36 +0000 (11:05 +0000)]
* wl-e21.el (wl-biff-init-icons): Don't generate icons of the display does not
support graphics.
(wl-plugged-init-icons): Ditto.
(wl-folder-init-icons): Ditto.
* wl-demo.el (wl-demo): Chech closely whether the display supports graphics.
okazaki [Fri, 16 Feb 2001 21:33:29 +0000 (21:33 +0000)]
Typo fix.
teranisi [Thu, 8 Feb 2001 22:17:17 +0000 (22:17 +0000)]
* wl-summary.el (wl-summary-get-original-buffer): New function.
(wl-summary-set-crosspost): Use it.
(wl-summary-target-mark-uudecode): Ditto.
(wl-summary-reedit): Ditto.
(wl-summary-resend-bounced-mail): Ditto.
(wl-summary-update-crosspost): Eliminated (It may be incorporated
into `elmo-folder-append-msgdb' method of elmo-nntp-folder class).
* wl-message.el (wl-message-buffer-display): Added argumnet `unread'.
(wl-message-display-internal): Ditto.
* elmo-mime.el (elmo-mime-message-display): Added argument `unread'.
(elmo-mime-message-display-as-is): Ditto.
teranisi [Wed, 7 Feb 2001 08:44:54 +0000 (08:44 +0000)]
Fixed.
teranisi [Wed, 7 Feb 2001 08:43:06 +0000 (08:43 +0000)]
* elmo-pipe.el (elmo-pipe-drain): Eliminated needless bindings;
Use `elmo-close-internal' instead of `elmo-close'.
teranisi [Wed, 7 Feb 2001 06:45:29 +0000 (06:45 +0000)]
* wl-draft.el (wl-draft-parse-msg-id-list-string): Fix.
teranisi [Wed, 7 Feb 2001 04:00:40 +0000 (04:00 +0000)]
Fix last commit.
teranisi [Wed, 7 Feb 2001 01:31:31 +0000 (01:31 +0000)]
Fix last commit.
teranisi [Wed, 7 Feb 2001 01:28:23 +0000 (01:28 +0000)]
Working branch `elmo-lunafy' is created.
The aim of this branch is:
* lunafy elmo (Rearrange elmo module).
* section-based message caching.
* message buffer caching & prefetching.
* elmo-nmz.el
See MEMO-lunafy for more detail.
Note that it is verrry alpha status.
Currently some features do not work (or very unstable).
tomo [Tue, 6 Feb 2001 02:58:05 +0000 (02:58 +0000)]
This commit was manufactured by cvs2svn to create branch 'elmo-lunafy'.
teranisi [Tue, 6 Feb 2001 02:58:04 +0000 (02:58 +0000)]
* wl-mime.el (wl-draft-preview-message):
Run `wl-draft-send-hook' before collecting recipients information;
Bind `wl-draft-config-exec-flag' while running `wl-draft-send-hook'.
* tm-wl.el (wl-draft-preview-message): Ditto.
teranisi [Mon, 5 Feb 2001 07:33:25 +0000 (07:33 +0000)]
* wl-mime.el (wl-draft-preview-message): Fixed problem that
wrong receipients are displayed when forwarded message.
okazaki [Thu, 1 Feb 2001 03:44:00 +0000 (03:44 +0000)]
Update.
okazaki [Thu, 1 Feb 2001 03:42:12 +0000 (03:42 +0000)]
* elmo-cache.el (elmo-cache-expire-by-size): Count
a disk usage for a cache file entry in KB even when
its kind is a directory.
teranisi [Thu, 1 Feb 2001 01:50:11 +0000 (01:50 +0000)]
Update.
teranisi [Thu, 1 Feb 2001 01:47:34 +0000 (01:47 +0000)]
Sync up with 2.4.1.
Version number is increased to 2.5.7.
teranisi [Tue, 30 Jan 2001 00:34:37 +0000 (00:34 +0000)]
Update.
teranisi [Tue, 30 Jan 2001 00:34:08 +0000 (00:34 +0000)]
* utils/bbdb-wl.el (toplevel): Require 'bbdb at topl evel.
(Advised by YAMASHITA Junji <ysjj@unixuser.org>)
yamaoka [Mon, 29 Jan 2001 23:58:31 +0000 (23:58 +0000)]
* wl-message.el (wl-message-next-page): Bind `window-pixel-scroll-increment'
to nil while scrolling up.
kaoru [Sat, 27 Jan 2001 05:21:35 +0000 (05:21 +0000)]
* wl-vars.el (wl-save-hook): New hook.
* wl.el (wl-save): Call `wl-save-hook'.
kaoru [Sat, 27 Jan 2001 05:17:16 +0000 (05:17 +0000)]
Sync with wl-2_4.
2001-01-27 TAKAHASHI Kaoru <kaoru@kaisei.org>
* wl-draft.el (wl-draft-reply-list-symbol): Remove FROM argument.
Argument WITH-ARG instead of NO-ARG (negative mean).
(wl-draft-reply): WITH-ARG instead of NO-ARG.
* wl-summary.el (wl-summary-reply): Fixed `wl-draft-reply' call point.
* wl-message.el (wl-message-follow-current-entity): Likewise.
2001-01-26 TAKAHASHI Kaoru <kaoru@kaisei.org>
* wl-draft.el (wl-draft-reply-list-symbol): Change argument order.
FROM was optional argument.
(wl-draft-reply): Fixed `wl-draft-reply-list-symbol' call point.
kaoru [Tue, 23 Jan 2001 12:03:46 +0000 (12:03 +0000)]
* Version number is increased to 2.5.6.
* elmo-version.el (elmo-version): Up to 2.5.6.
kaoru [Tue, 23 Jan 2001 11:59:35 +0000 (11:59 +0000)]
Sync with wl-2_4.
kaoru [Tue, 23 Jan 2001 11:48:39 +0000 (11:48 +0000)]
* wl-version.el (wl-version-show): Removed.
(wl-version): Add `interactive'.
teranisi [Tue, 23 Jan 2001 09:10:03 +0000 (09:10 +0000)]
* Synch up with wl-2_4 and merged following changes.
2001-01-23 YAMASHITA Junji <ysjj@unixuser.org>
* utils/bbdb-wl.el (toplevel): commented out dummy function.
(bbdb-wl-extract-field-value-internal): Renamed from
`bbdb-extract-field-value-internal'.
(toplevel): Fixed load order of bbdb-hooks.el for recent bbdb.
2001-01-22 YAMASHITA Junji <ysjj@unixuser.org>
* utils/bbdb-wl.el (bbdb-wl-get-petname): New function.
2001-01-22 YAMASHITA Junji <ysjj@unixuser.org>
* wl-summary.el (wl-summary-get-petname-func): New variable.
(wl-summary-default-from): funcall `wl-summary-get-petname-func'
instead of `wl-address-get-petname-1'.
(wl-summary-simple-from): Ditto.
* wl-address.el (wl-address-get-petname-1): Define as function.
kaoru [Tue, 23 Jan 2001 07:48:45 +0000 (07:48 +0000)]
Update.
kaoru [Tue, 23 Jan 2001 07:48:33 +0000 (07:48 +0000)]
* utils/ptexinfmt.el: Support @letterpaper and @afivepaper.
kaoru [Tue, 23 Jan 2001 07:43:05 +0000 (07:43 +0000)]
Update to version 2001-01-12.11.
kaoru [Sat, 20 Jan 2001 14:13:38 +0000 (14:13 +0000)]
Add 2.4.1 (Stand By Me).
teranisi [Thu, 18 Jan 2001 11:02:23 +0000 (11:02 +0000)]
Synch up with wl-2.4.1pre.
* Version number is increased to 2.5.5.
* elmo-version.el (elmo-version): Up to 2.5.5.
okazaki [Tue, 16 Jan 2001 21:29:19 +0000 (21:29 +0000)]
Merge 1.15.2.4 from wl-2_4 branch.
2000-12-19 Katsumi Yamaoka <yamaoka@jpl.org>
* wl-draft.el (wl-draft-reply): Bind `mime-header-lexical-analyzer'
to the default value as well as `eword-lexical-analyzer'.
kaoru [Sun, 31 Dec 2000 14:56:00 +0000 (14:56 +0000)]
Change x-face-mule settings.
Add &optional for lambda function.
okazaki [Sat, 30 Dec 2000 05:16:17 +0000 (05:16 +0000)]
Update.
okazaki [Sat, 30 Dec 2000 05:15:38 +0000 (05:15 +0000)]
Merge 1.15.2.2 and 1.15.2.3 from wl-2_4 branch.
2000-12-12 KOGURO Naoki <koguro@dd.iij4u.or.jp>
* wl-draft.el (wl-draft-send-mail-with-pop-before-smtp): Close POP
connection before call `wl-draft-send-mail-with-smtp'.
kaoru [Sat, 30 Dec 2000 04:06:55 +0000 (04:06 +0000)]
Typo.
kaoru [Sat, 30 Dec 2000 04:04:26 +0000 (04:04 +0000)]
* WL-MK (config-wl-package-subr): Don't try load `WL-ELS.el'.
And permit `WL-CFG.el' override for committer.
* WL-MK (toplevel): `file-executable-p' check use `if' instead of
`or'.
kaoru [Sat, 30 Dec 2000 03:10:15 +0000 (03:10 +0000)]
Update to version 2000-12-11.07.
teranisi [Fri, 22 Dec 2000 06:02:36 +0000 (06:02 +0000)]
* elmo-imap4.el (elmo-network-authenticate-session): Fixed a logic for
response checking.
ueno [Fri, 15 Dec 2000 10:55:58 +0000 (10:55 +0000)]
update.
ueno [Fri, 15 Dec 2000 10:55:39 +0000 (10:55 +0000)]
* elmo-net.el: Add autoload settings for `starttls-negotiate',
`sasl-find-mechanism', `sasl-make-client', `sasl-mechanism-name',
`sasl-next-step', `sasl-step-data' and `sasl-step-set-data'; bind
`sasl-mechanisms'.
* elmo-imap4.el: Don't require `sasl'; remove autoload settings
for `starttls-open-stream' and `starttls-negotiate'.
* elmo-nntp.el: Remove autoload settings for
`starttls-open-stream' and `starttls-negotiate'.
* elmo-pop3.el: Don't require `sasl'; remove autoload settings
for `starttls-open-stream' and `starttls-negotiate'; don't enclose
`luna-define-class' with `eval-and-compile'.
okada [Fri, 1 Dec 2000 09:31:45 +0000 (09:31 +0000)]
* elmo-util.el (elmo-read-search-condition-internal):
Require an element of table for searching field.
teranisi [Thu, 30 Nov 2000 01:59:27 +0000 (01:59 +0000)]
Sync up with 2.4.0.
Version number is incremented to 2.5.4.
kaoru [Sun, 26 Nov 2000 23:08:04 +0000 (23:08 +0000)]
Checkdoc.
okada [Sun, 26 Nov 2000 22:24:57 +0000 (22:24 +0000)]
* wl.el (wl-check-environment): Additional check for
'wl-local-domain' and `wl-message-id-domain'.
okada [Sun, 26 Nov 2000 10:45:50 +0000 (10:45 +0000)]
* elmo-nntp.el (elmo-network-initialize-session): Accept response 20[01].
kaoru [Fri, 24 Nov 2000 17:48:38 +0000 (17:48 +0000)]
Update to version 2000-11-10.15.
okada [Fri, 24 Nov 2000 16:47:00 +0000 (16:47 +0000)]
omit
okazaki [Thu, 23 Nov 2000 01:31:07 +0000 (01:31 +0000)]
Up VERSION to 2.5.3.
okada [Wed, 22 Nov 2000 13:44:27 +0000 (13:44 +0000)]
* elmo-nntp.el (elmo-network-initialize-session): Skip garbage output
before greeting.
teranisi [Wed, 22 Nov 2000 11:41:02 +0000 (11:41 +0000)]
Fixed.
teranisi [Wed, 22 Nov 2000 11:28:09 +0000 (11:28 +0000)]
Synch with wl-2_4.