From 3795088723027d86d671ab18e16ea2300c08d48f Mon Sep 17 00:00:00 2001 From: okazaki Date: Sat, 24 Feb 2001 22:18:48 +0000 Subject: [PATCH] Merge changes of 1.9 -> 1.10 from main trunk. * 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. --- elmo/elmo-cache.el | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/elmo/elmo-cache.el b/elmo/elmo-cache.el index fba1de5..993b7d7 100644 --- a/elmo/elmo-cache.el +++ b/elmo/elmo-cache.el @@ -141,11 +141,7 @@ If KBYTES is kilo bytes (This value must be float)." (while (and (<= size total) (setq oldest (elmo-cache-get-oldest-cache-file-entity cfl))) (setq cur-file (expand-file-name (car (cdr oldest)) (car oldest))) - (if (file-directory-p cur-file) - (setq cur-size (elmo-disk-usage cur-file)) - (setq cur-size - (/ (float (nth 7 (file-attributes cur-file))) - Kbytes))) + (setq cur-size (/ (elmo-disk-usage cur-file) Kbytes)) (when (elmo-cache-force-delete cur-file locked) (setq count (+ count 1)) (message "%d cache(s) are expired." count)) -- 1.7.10.4