From e33c291149de7960e7ab933ad415e7ec5f68b2c5 Mon Sep 17 00:00:00 2001 From: okada Date: Fri, 18 Jan 2002 19:37:01 +0000 Subject: [PATCH] * Version number is increased to 2.9.5. * wl-summary.el (wl-summary-prefetch-msg): Fix for buffer-cache. --- doc/version.tex | 2 +- elmo/ChangeLog | 4 ++ elmo/elmo-version.el | 2 +- wl/ChangeLog | 5 +++ wl/wl-summary.el | 113 +++++++++++++++++++++++++------------------------- 5 files changed, 68 insertions(+), 58 deletions(-) diff --git a/doc/version.tex b/doc/version.tex index 6fb81ee..6d16ca4 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1 +1 @@ -\def\versionnumber{2.9.4} +\def\versionnumber{2.9.5} diff --git a/elmo/ChangeLog b/elmo/ChangeLog index d1ebe9d..a5d5e70 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,7 @@ +2002-01-19 Kenichi OKADA + + * elmo-version.el (elmo-version): Up to 2.9.5. + 2002-01-17 Kenichi OKADA * elmo-dop.el (elmo-dop-queue-merge): Implement. diff --git a/elmo/elmo-version.el b/elmo/elmo-version.el index 8e2de45..ee8098c 100644 --- a/elmo/elmo-version.el +++ b/elmo/elmo-version.el @@ -40,7 +40,7 @@ ;; product-define in the first place (product-provide 'elmo-version ;; Don't forget to check `wl-version.el' and Info. - (product-define "ELMO" nil '(2 9 4))) + (product-define "ELMO" nil '(2 9 5))) ;; set version-string (product-version-as-string 'elmo-version) diff --git a/wl/ChangeLog b/wl/ChangeLog index 6b1f7b9..24c6210 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,5 +1,10 @@ 2002-01-19 Kenichi OKADA + * Version number is increased to 2.9.5. + * wl-summary.el (wl-summary-prefetch-msg): Fix for buffer-cache. + +2002-01-19 Kenichi OKADA + * wl-vars.el (wl-fldmgr-allow-rename-access-group): New variable. * wl-fldmgr.el (wl-fldmgr-rename): Allow rename for access group. Based on the patch written by diff --git a/wl/wl-summary.el b/wl/wl-summary.el index f83765b..7d8b0e7 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1268,68 +1268,69 @@ If ARG is non-nil, checking is omitted." (size (elmo-msgdb-overview-entity-get-size ov)) (inhibit-read-only t) (buffer-read-only nil) + (file-cached (elmo-file-cache-exists-p message-id)) (force-read (and size (or (null wl-prefetch-threshold) (< size wl-prefetch-threshold)))) mark new-mark) - (if (or arg - (null (elmo-file-cache-exists-p message-id))) - (unwind-protect - (progn - (when (and size (not force-read) wl-prefetch-confirm) - (setq force-read - (save-restriction - (widen) - (y-or-n-p - (format - "Message from %s has %d bytes. Prefetch it? " - (concat - "[ " - (save-match-data - (wl-set-string-width - wl-summary-from-width - (wl-summary-from-func-internal - (eword-decode-string - (elmo-delete-char - ?\" - (or - (elmo-msgdb-overview-entity-get-from ov) - "??")))))) " ]") - size)))) - (message "")) ; flush. - (setq mark (cadr (assq number mark-alist))) - (if force-read - (save-excursion - (save-match-data - ;; online + (unwind-protect + (progn + (when (and (or arg (not file-cached)) + size (not force-read) wl-prefetch-confirm) + (setq force-read + (save-restriction + (widen) + (y-or-n-p + (format + "Message from %s has %d bytes. Prefetch it? " + (concat + "[ " + (save-match-data + (wl-set-string-width + wl-summary-from-width + (wl-summary-from-func-internal + (eword-decode-string + (elmo-delete-char + ?\" + (or + (elmo-msgdb-overview-entity-get-from ov) + "??")))))) " ]") + size)))) + (message "")) ; flush. + (setq mark (cadr (assq number mark-alist))) + (if force-read + (save-excursion + (save-match-data + ;; online + (if (or arg (not file-cached)) (elmo-message-encache wl-summary-buffer-elmo-folder - number) - (setq new-mark - (cond - ((string= mark - wl-summary-unread-uncached-mark) - wl-summary-unread-cached-mark) - ((string= mark wl-summary-new-mark) - (setq wl-summary-buffer-new-count - (- wl-summary-buffer-new-count 1)) - (setq wl-summary-buffer-unread-count - (+ wl-summary-buffer-unread-count 1)) - wl-summary-unread-cached-mark) - ((string= mark wl-summary-read-uncached-mark) - nil) - (t mark))) - (setq mark-alist (elmo-msgdb-mark-set - mark-alist number new-mark)) - (or new-mark (setq new-mark " ")) - (elmo-msgdb-set-mark-alist msgdb mark-alist) - (wl-summary-set-mark-modified) - (wl-summary-update-modeline) - (wl-folder-update-unread - (wl-summary-buffer-folder-name) - (+ wl-summary-buffer-unread-count - wl-summary-buffer-new-count))) - new-mark)))))))) + number)) + (setq new-mark + (cond + ((string= mark + wl-summary-unread-uncached-mark) + wl-summary-unread-cached-mark) + ((string= mark wl-summary-new-mark) + (setq wl-summary-buffer-new-count + (- wl-summary-buffer-new-count 1)) + (setq wl-summary-buffer-unread-count + (+ wl-summary-buffer-unread-count 1)) + wl-summary-unread-cached-mark) + ((string= mark wl-summary-read-uncached-mark) + nil) + (t mark))) + (setq mark-alist (elmo-msgdb-mark-set + mark-alist number new-mark)) + (or new-mark (setq new-mark " ")) + (elmo-msgdb-set-mark-alist msgdb mark-alist) + (wl-summary-set-mark-modified) + (wl-summary-update-modeline) + (wl-folder-update-unread + (wl-summary-buffer-folder-name) + (+ wl-summary-buffer-unread-count + wl-summary-buffer-new-count))) + new-mark))))))) ;;(defvar wl-summary-message-uncached-marks ;; (list wl-summary-new-mark -- 1.7.10.4