From: Glenn Morris <rgm@gnu.org>
Date: Fri, 25 Sep 2009 06:15:01 +0000 (+0000)
Subject: (rmail-mime-bulk-handler): Print the size of attachments.
X-Git-Tag: emacs-pretest-23.1.90~1146
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=692208828eb7fc0eacdc38a75f6f9c69ab0deb47;p=emacs.git

(rmail-mime-bulk-handler): Print the size of attachments.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95aa7019901..5c248e94cd2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -30,7 +30,8 @@
 	(rmail-mime-insert-image): New function.
 	(rmail-mime-image): Use rmail-mime-insert-image.
 	(rmail-mime-bulk-handler): Remove optional `image' argument, instead
-	obey the value of `rmail-mime-show-images' option.
+	obey the value of `rmail-mime-show-images' option.  Print the size of
+	attachments.
 
 2009-09-25  David Engster  <deng@randomsample.de>
 
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index f7f7fb7609f..077a8bfe1ff 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -177,7 +177,14 @@ depends upon the value of `rmail-mime-show-images'."
 		       "noname"))
 	 (label (format "\nAttached %s file: " (car content-type)))
 	 (data (buffer-string))
+	 (udata (string-as-unibyte data))
+	 (size (length udata))
+	 (units '(B kB MB GB))
 	 type)
+    (while (and (> size 1024.0)	; cribbed from gnus-agent-expire-done-message
+		(cdr units))
+      (setq size (/ size 1024.0)
+	    units (cdr units)))
     (delete-region (point-min) (point-max))
     (insert label)
     (insert-button filename
@@ -186,23 +193,22 @@ depends upon the value of `rmail-mime-show-images'."
 		   'filename filename
 		   'directory (file-name-as-directory directory)
 		   'data data)
+    (insert (format " (%.0f%s)" size (car units)))
     (when (and rmail-mime-show-images
 	       (string-match "image/\\(.*\\)" (setq type (car content-type)))
 	       (setq type (concat "." (match-string 1 type))
 		     type (image-type-from-file-name type))
 	       (memq type image-types)
 	       (image-type-available-p type))
-      (setq data (string-as-unibyte data))
       (insert " ")
-      ;; FIXME ought to check or at least display the image size.
       (cond ((eq rmail-mime-show-images 'button)
 	     (insert-button "Display"
 			    :type 'rmail-mime-image
 			    'help-echo "mouse-2, RET: Show image"
 			    'image-type type
-			    'image-data data))
+			    'image-data udata))
 	    (t
-	     (rmail-mime-insert-image type data))))))
+	     (rmail-mime-insert-image type udata))))))
 
 (defun test-rmail-mime-bulk-handler ()
   "Test of a mail used as an example in RFC 2183."