From 4075ff9ba2ba89453008d40636af56af755400c5 Mon Sep 17 00:00:00 2001 From: teranisi Date: Tue, 19 Jun 2001 15:09:32 +0000 Subject: [PATCH] * wl-summary.el (wl-summary-buffer-next-message-function): New variable. (wl-summary-next-message): Call wl-summary-buffer-next-message-function if it is bound. * wl-e21.el (wl-plugged-set-folder-icon): Don't propertize image string. * elmo.el (elmo-message-encache): Set unread argument for elmo-message-fetch. * elmo-shimbun.el (elmo-dop): Require 'elmo-dop. --- elmo/ChangeLog | 5 ++++ elmo/elmo-shimbun.el | 1 + elmo/elmo.el | 3 ++- wl/ChangeLog | 8 ++++++ wl/wl-e21.el | 10 +++---- wl/wl-summary.el | 71 +++++++++++++++++++++++++++----------------------- 6 files changed, 58 insertions(+), 40 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index 0e3fc7f..5310d75 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,5 +1,10 @@ 2001-06-19 Yuuichi Teranishi + * elmo.el (elmo-message-encache): Set unread argument for + elmo-message-fetch. + + * elmo-shimbun.el (elmo-dop): Require 'elmo-dop. + * elmo.el (elmo-net-port-info): New method. * elmo-shimbun.el (elmo-net-port-info): Define. diff --git a/elmo/elmo-shimbun.el b/elmo/elmo-shimbun.el index 9d1f27b..06ae738 100644 --- a/elmo/elmo-shimbun.el +++ b/elmo/elmo-shimbun.el @@ -30,6 +30,7 @@ ;; (require 'elmo) (require 'elmo-map) +(require 'elmo-dop) (require 'shimbun) (defcustom elmo-shimbun-check-interval 60 diff --git a/elmo/elmo.el b/elmo/elmo.el index b16dd97..3d25d96 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -523,7 +523,8 @@ Return newly created temporary directory name which contains temporary files.") t ;save-cache (elmo-file-cache-get-path (elmo-message-field - folder number 'message-id))))) + folder number 'message-id))) + nil nil 'unread)) (luna-define-generic elmo-message-fetch (folder number strategy &optional diff --git a/wl/ChangeLog b/wl/ChangeLog index 4741628..19758fd 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,13 @@ 2001-06-19 Yuuichi Teranishi + * wl-summary.el (wl-summary-buffer-next-message-function): New + variable. + (wl-summary-next-message): Call wl-summary-buffer-next-message-function + if it is bound. + + * wl-e21.el (wl-plugged-set-folder-icon): Don't propertize image + string. + * wl.el (wl-plugged-dop-queue-info): Fix to check stream-type. (wl-plugged-drawing): Ditto. diff --git a/wl/wl-e21.el b/wl/wl-e21.el index e441e07..2ecf5dd 100644 --- a/wl/wl-e21.el +++ b/wl/wl-e21.el @@ -409,14 +409,12 @@ (if (wl-e21-display-image-p) (let (type) (cond ((string= folder wl-queue-folder) - (concat (propertize " " 'display - (get 'wl-folder-queue-image 'image)) + (concat (get 'wl-folder-queue-image 'image) string)) ((setq type (elmo-folder-type folder)) - (concat (propertize " " 'display - (get (intern (format "wl-folder-%s-image" - type)) - 'image)) + (concat (get (intern (format "wl-folder-%s-image" + type)) + 'image) string)) (t string))) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index ae60505..896ebf5 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -104,6 +104,7 @@ (defvar wl-summary-buffer-prev-folder-function nil) (defvar wl-summary-buffer-next-folder-function nil) (defvar wl-summary-buffer-exit-function nil) +(defvar wl-summary-buffer-next-message-function nil) (defvar wl-summary-buffer-number-list nil) (defvar wl-summary-buffer-msgdb nil) (defvar wl-summary-buffer-folder-name nil) @@ -174,6 +175,7 @@ (make-variable-buffer-local 'wl-summary-buffer-prev-folder-function) (make-variable-buffer-local 'wl-summary-buffer-next-folder-function) (make-variable-buffer-local 'wl-summary-buffer-exit-function) +(make-variable-buffer-local 'wl-summary-buffer-next-message-function) (make-variable-buffer-local 'wl-summary-buffer-number-list) (make-variable-buffer-local 'wl-summary-buffer-msgdb) (make-variable-buffer-local 'wl-summary-buffer-folder-name) @@ -4306,39 +4308,42 @@ If ARG, exit virtual folder." (p . (, (regexp-quote wl-summary-important-mark)))))))) (defsubst wl-summary-next-message (num direction hereto) - (let ((cur-spec (cdr (assq wl-summary-move-order - (if (elmo-folder-plugged-p - wl-summary-buffer-elmo-folder) - wl-summary-move-spec-plugged-alist - wl-summary-move-spec-unplugged-alist)))) - (nums (memq num (if (eq direction 'up) - (reverse wl-summary-buffer-number-list) - wl-summary-buffer-number-list))) - marked-list nums2) - (unless hereto (setq nums (cdr nums))) - (setq nums2 nums) - (if cur-spec - (catch 'done - (while cur-spec - (setq nums nums2) - (cond ((eq (car (car cur-spec)) 'p) - (if (setq marked-list (elmo-folder-list-messages-mark-match - wl-summary-buffer-elmo-folder - (cdr (car cur-spec)))) - (while nums - (if (memq (car nums) marked-list) - (throw 'done (car nums))) - (setq nums (cdr nums))))) - ((eq (car (car cur-spec)) 't) - (if wl-summary-buffer-target-mark-list - (while nums - (if (memq (car nums) - wl-summary-buffer-target-mark-list) - (throw 'done (car nums))) - (setq nums (cdr nums)))))) - (setq cur-spec (cdr cur-spec)))) - (car nums)))) - + (if wl-summary-buffer-next-message-function + (funcall wl-summary-buffer-next-message-function num direction hereto) + (let ((cur-spec (cdr (assq wl-summary-move-order + (if (elmo-folder-plugged-p + wl-summary-buffer-elmo-folder) + wl-summary-move-spec-plugged-alist + wl-summary-move-spec-unplugged-alist)))) + (nums (memq num (if (eq direction 'up) + (reverse wl-summary-buffer-number-list) + wl-summary-buffer-number-list))) + marked-list nums2) + (unless hereto (setq nums (cdr nums))) + (setq nums2 nums) + (if cur-spec + (catch 'done + (while cur-spec + (setq nums nums2) + (cond ((eq (car (car cur-spec)) 'p) + (if (setq marked-list + (elmo-folder-list-messages-mark-match + wl-summary-buffer-elmo-folder + (cdr (car cur-spec)))) + (while nums + (if (memq (car nums) marked-list) + (throw 'done (car nums))) + (setq nums (cdr nums))))) + ((eq (car (car cur-spec)) 't) + (if wl-summary-buffer-target-mark-list + (while nums + (if (memq (car nums) + wl-summary-buffer-target-mark-list) + (throw 'done (car nums))) + (setq nums (cdr nums)))))) + (setq cur-spec (cdr cur-spec)))) + (car nums))))) + (defsubst wl-summary-cursor-move (direction hereto) (when (and (eq direction 'up) (eobp)) -- 1.7.10.4