From 184ac8312c93b253198efa6102a11f369641df4e Mon Sep 17 00:00:00 2001 From: vitaly Date: Wed, 25 Mar 2009 09:19:01 +0100 Subject: [PATCH] Synchronize with CVS version --- ChangeLog | 5 +++++ doc/wl-ja.texi | 2 +- doc/wl.texi | 2 +- elmo/ChangeLog | 5 +++++ elmo/elsp-bsfilter.el | 2 +- wl/ChangeLog | 16 +++++++++++++++ wl/wl-summary.el | 57 ++++++++++++++++++++++++++++++--------------------- 7 files changed, 63 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 69b0cd2..1e9d30b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-11-25 TAKAHASHI Kaoru + + * INSTALL: Updated recommended version of FLIM. + * INSTALL.ja: Ditto. + 2008-02-19 TAKAHASHI Kaoru * Makefile (clean-elc): Remove *.elx for compile-strict. diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi index fe5262d..6f728fa 100644 --- a/doc/wl-ja.texi +++ b/doc/wl-ja.texi @@ -7383,7 +7383,7 @@ bsfilter を起動するシェルに与える引数を指定します。 @item elmo-spam-bsfilter-update-switch @vindex elmo-spam-bsfilter-update-switch -初期設定は、@code{"--synchronous-auto-update"}。 +初期設定は、@code{"--auto-update"}。 メッセージを学習する際に @command{bsfilter} に与える引数を指定します。 @end table diff --git a/doc/wl.texi b/doc/wl.texi index 1438e2d..e09414c 100644 --- a/doc/wl.texi +++ b/doc/wl.texi @@ -7440,7 +7440,7 @@ Specify options to give to the shell executing @command{bsfilter}. @item elmo-spam-bsfilter-update-switch @vindex elmo-spam-bsfilter-update-switch -The initial setting is @code{"--synchronous-auto-update"}. +The initial setting is @code{"--auto-update"}. Specify options to give to @command{bsfilter} for learning messages. @end table diff --git a/elmo/ChangeLog b/elmo/ChangeLog index ed61bf3..40aa92d 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2009-03-22 Tetsurou Okazaki + + * elsp-bsfilter.el (elmo-spam-bsfilter-update-switch): Change + default value to `--auto-update'. + 2008-07-06 TAKAHASHI Kaoru * elmo-pop3.el (elmo-pop3-read-contents): Fix double `goto-char'. diff --git a/elmo/elsp-bsfilter.el b/elmo/elsp-bsfilter.el index 8c1a26b..980e939 100644 --- a/elmo/elsp-bsfilter.el +++ b/elmo/elsp-bsfilter.el @@ -56,7 +56,7 @@ :type '(repeat string) :group 'elmo-spam-bsfilter) -(defcustom elmo-spam-bsfilter-update-switch "--synchronous-auto-update" +(defcustom elmo-spam-bsfilter-update-switch "--auto-update" "*The switch that Bsfilter uses to update database with classify." :type 'string :group 'elmo-spam-bsfilter) diff --git a/wl/ChangeLog b/wl/ChangeLog index d329184..ddd4228 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,19 @@ +2009-03-16 Tetsurou Okazaki + + * wl-summary.el (wl-summary-previous-message-number): New function. + (wl-summary-next-message-number): Ditto. + (wl-summary-default-get-next-msg): Use `wl-summary-previous-message-number' and + `wl-summary-next-message-number'. + (wl-summary-get-prev-unread-folder): Use `with-current-buffer' instead of `save-excursion'. + Inline temporary variable `cur-id'. + (wl-summary-get-next-unread-folder): Ditto. + (wl-summary-get-next-folder): Ditto. + (wl-summary-get-prev-folder): Ditto. Remove a local variable `last-entity'. + +2009-01-01 TAKAHASHI Kaoru + + * wl-demo.el (wl-demo-copyright-notice): Add 2009. + 2008-09-05 Kenichi Okada * wl-summary.el (wl-summary-buffer-folder-name) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index d044f34..ac04708 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -4412,36 +4412,34 @@ Use function list is `wl-summary-write-current-folder-functions'." (wl-summary-entity-info-msg next-entity finfo))))))))) (defun wl-summary-get-prev-folder () - (let ((folder-buf (get-buffer wl-folder-buffer-name)) - last-entity cur-id) + (let ((folder-buf (get-buffer wl-folder-buffer-name))) (when folder-buf - (setq cur-id (save-excursion (set-buffer folder-buf) - wl-folder-buffer-cur-entity-id)) - (wl-folder-get-prev-folder cur-id)))) + (wl-folder-get-prev-folder + (with-current-buffer folder-buf + wl-folder-buffer-cur-entity-id))))) (defun wl-summary-get-next-folder () - (let ((folder-buf (get-buffer wl-folder-buffer-name)) - cur-id) + (let ((folder-buf (get-buffer wl-folder-buffer-name))) (when folder-buf - (setq cur-id (save-excursion (set-buffer folder-buf) - wl-folder-buffer-cur-entity-id)) - (wl-folder-get-next-folder cur-id)))) + (wl-folder-get-next-folder + (with-current-buffer folder-buf + wl-folder-buffer-cur-entity-id))))) (defun wl-summary-get-next-unread-folder () - (let ((folder-buf (get-buffer wl-folder-buffer-name)) - cur-id) + (let ((folder-buf (get-buffer wl-folder-buffer-name))) (when folder-buf - (setq cur-id (save-excursion (set-buffer folder-buf) - wl-folder-buffer-cur-entity-id)) - (wl-folder-get-next-folder cur-id 'unread)))) + (wl-folder-get-next-folder + (with-current-buffer folder-buf + wl-folder-buffer-cur-entity-id) + 'unread)))) (defun wl-summary-get-prev-unread-folder () - (let ((folder-buf (get-buffer wl-folder-buffer-name)) - cur-id) + (let ((folder-buf (get-buffer wl-folder-buffer-name))) (when folder-buf - (setq cur-id (save-excursion (set-buffer folder-buf) - wl-folder-buffer-cur-entity-id)) - (wl-folder-get-prev-folder cur-id 'unread)))) + (wl-folder-get-prev-folder + (with-current-buffer folder-buf + wl-folder-buffer-cur-entity-id) + 'unread)))) (defun wl-summary-down (&optional interactive skip-no-unread) (interactive) @@ -5055,14 +5053,27 @@ If ARG is numeric number, decode message as following: ;; sum)) ;; (message "Dropping...done")))) +(defun wl-summary-previous-message-number (msg) + "Return a message number previous to the message specified by MSG." + (let ((list wl-summary-buffer-number-list) + previous) + (while (and list (not (eq msg (car list)))) + (setq previous (car list)) + (setq list (cdr list))) + previous)) + +(defun wl-summary-next-message-number (msg) + "Return a message number next to the message specified by MSG." + (cadr (memq msg wl-summary-buffer-number-list))) + (defun wl-summary-default-get-next-msg (msg) (or (wl-summary-next-message msg (if wl-summary-move-direction-downward 'down 'up) nil) - (cadr (memq msg (if wl-summary-move-direction-downward - wl-summary-buffer-number-list - (reverse wl-summary-buffer-number-list)))))) + (if wl-summary-move-direction-downward + (wl-summary-next-message-number msg) + (wl-summary-previous-message-number msg)))) (defun wl-summary-save-current-message () "Save current message for `wl-summary-yank-saved-message'." -- 2.11.4.GIT