From: okada Date: Thu, 22 Nov 2001 18:13:17 +0000 (+0000) Subject: * elmo-pipe.el (elmo-pipe-drain): Load killed-list. X-Git-Tag: wl-2_8-root~128 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cca9d4553a6cb38a43325742bd4802c1f5129be4;p=elisp%2Fwanderlust.git * elmo-pipe.el (elmo-pipe-drain): Load killed-list. --- diff --git a/elmo/ChangeLog b/elmo/ChangeLog index ddce07f..453de16 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,7 @@ +2001-11-23 Kenichi OKADA + + * elmo-pipe.el (elmo-pipe-drain): Load killed-list. + 2001-11-21 Hiroya Murata * elmo-util.el (elmo-copy-file): Added argument diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el index e6942b3..ca327a7 100644 --- a/elmo/elmo-imap4.el +++ b/elmo/elmo-imap4.el @@ -1779,7 +1779,7 @@ Return nil if no complete line has arrived." folder (elmo-get-network-stream-type elmo-imap4-default-stream-type))) folder)) - + ;;; ELMO IMAP4 folder (luna-define-method elmo-folder-expand-msgdb-path ((folder elmo-imap4-folder)) diff --git a/elmo/elmo-pipe.el b/elmo/elmo-pipe.el index 62a8358..2ed6ddf 100644 --- a/elmo/elmo-pipe.el +++ b/elmo/elmo-pipe.el @@ -102,8 +102,12 @@ (let ((elmo-inhibit-number-mapping t) ; No need to use UIDL msgs len) (message "Checking %s..." (elmo-folder-name-internal src)) - ;; for load killed-list - (elmo-folder-open src) + ;; Warnnig: some function requires msgdb + ;; but elmo-folder-open-internal do not load msgdb. + (elmo-folder-open-internal src) + (elmo-folder-set-killed-list-internal + src + (elmo-msgdb-killed-list-load (elmo-folder-msgdb-path src))) (setq msgs (elmo-folder-list-messages src) len (length msgs)) (when (> len elmo-display-progress-threshold) @@ -123,6 +127,7 @@ ;; Don't save msgdb here. ;; Because summary view of original folder is not updated yet. (elmo-folder-close-internal src) + (elmo-folder-set-killed-list-internal src nil) (run-hooks 'elmo-pipe-drained-hook)) (luna-define-method elmo-folder-open-internal ((folder elmo-pipe-folder)) diff --git a/elmo/elmo.el b/elmo/elmo.el index e21e4c7..88bcda4 100644 --- a/elmo/elmo.el +++ b/elmo/elmo.el @@ -1201,7 +1201,7 @@ are mark strings for new messages, unread but cached messages, read but not cached messages, and important messages. If optional IGNORE-MSGDB is non-nil, current msgdb is thrown away except read mark status. If IGNORE-MSGDB is 'visible-only, only visible messages -\(the messages which are not in the killed-list\) are thrown away and +\(the messages which are not in the killed-list\) are thrown away and synchronized. If NO-CHECK is non-nil, rechecking folder is skipped. diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 9351e17..805a93e 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -3003,8 +3003,8 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (save-excursion (let ((inhibit-read-only t) (buffer-read-only nil) - (buf (current-buffer)) - sol eol rs re) + (buf (current-buffer)) + sol eol rs re) (beginning-of-line) (setq sol (point)) (end-of-line) @@ -3215,7 +3215,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER." (setq fld default)) (setq fld (elmo-string (wl-folder-get-realname fld))) (if (string-match "\n" fld) - (error "Not supported folder name: %s" fld)) + (error "Not supported folder name: %s" fld)) (unless no-create (if ignore-error (condition-case nil @@ -4315,7 +4315,7 @@ If ARG, exit virtual folder." (defsubst wl-summary-next-message (num direction hereto) (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 + (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 @@ -4348,7 +4348,7 @@ If ARG, exit virtual folder." (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)) @@ -4491,8 +4491,7 @@ If ARG, exit virtual folder." (when mes-win (wl-message-select-buffer wl-message-buffer) (run-hooks 'wl-summary-toggle-disp-folder-message-resumed-hook) - (select-window (get-buffer-window cur-buf))) - ) + (select-window (get-buffer-window cur-buf)))) ;; hide message window (let ((wl-stay-folder-window t) (mes-win (and wl-message-buffer @@ -4516,8 +4515,7 @@ If ARG, exit virtual folder." (when mes-win (wl-message-select-buffer wl-message-buffer) (run-hooks 'wl-summary-toggle-disp-folder-message-resumed-hook) - (select-window (get-buffer-window cur-buf)))) - )))) + (select-window (get-buffer-window cur-buf)))))))) (run-hooks 'wl-summary-toggle-disp-folder-hook)) (defun wl-summary-toggle-disp-msg (&optional arg) @@ -4544,7 +4542,7 @@ If ARG, exit virtual folder." (delete-window) (and (get-buffer-window cur-buf) (select-window (get-buffer-window cur-buf)))) - (run-hooks 'wl-summary-toggle-disp-off-hook))) + (run-hooks 'wl-summary-toggle-disp-off-hook))) (t (if (and wl-message-buffer (get-buffer-window wl-message-buffer)) ; already displayed @@ -4962,7 +4960,7 @@ Use function list is `wl-summary-write-current-folder-functions'." (if summary-buf (save-excursion (set-buffer summary-buf) - (setq subject + (setq subject (or (elmo-message-field folder number 'subject) "")))) (set-buffer mes-buf) (wl-draft-forward subject summary-buf) @@ -5190,7 +5188,7 @@ Use function list is `wl-summary-write-current-folder-functions'." (setq fld-buf (get-buffer wl-folder-buffer-name))) (if (setq fld-win (get-buffer-window fld-buf)) (delete-window fld-win))) - (setq wl-current-summary-buffer (current-buffer)) + (setq wl-current-summary-buffer (current-buffer)) (wl-summary-mark-as-read nil ;; not fetched, then change server-mark.