* elmo-pop3.el (elmo-pop3-process-filter): Don't use floor nor float.

* elmo-imap4.el (elmo-imap4-find-next-line): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 50698ff..4d42a24 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * elmo-pop3.el (elmo-pop3-process-filter): Don't use floor nor float.
+
+       * elmo-imap4.el (elmo-imap4-find-next-line): Ditto.
+
 2001-06-10  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo.el (elmo-folder-move-messages): Bind

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index c62d1a7..e47e654 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1144,14 +1144,14 @@ Return nil if no complete line has arrived."
            (progn
              (if (and elmo-imap4-display-literal-progress
                       (> (string-to-number (match-string 1))
-                         elmo-display-retrieval-progress-threshold))
+                         (min elmo-display-retrieval-progress-threshold 100)))
                  (elmo-display-progress
                   'elmo-display-retrieval-progress
                   (format "Retrieving (%d/%d bytes)..."
                           (- (point-max) (point))
                           (string-to-number (match-string 1)))
-                  (floor (* (/ (float (- (point-max) (point)))
-                               (string-to-number (match-string 1))) 100))))
+                  (/ (- (point-max) (point))
+                     (/ (string-to-number (match-string 1)) 100))))
              nil)
          (goto-char (+ (point) (string-to-number (match-string 1))))
          (elmo-imap4-find-next-line))

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index c0a95f9..0d5f2a4 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -239,14 +239,13 @@ set as non-nil.")
     (insert output)
     (if (and elmo-pop3-total-size
             (> elmo-pop3-total-size 
-               elmo-display-retrieval-progress-threshold))
+               (min elmo-display-retrieval-progress-threshold 100)))
        (elmo-display-progress
         'elmo-display-retrieval-progress
         (format "Retrieving (%d/%d bytes)..."
                 (buffer-size)
                 elmo-pop3-total-size)
-        (floor (* (/ (float (buffer-size))
-                     elmo-pop3-total-size) 100))))))
+        (/ (buffer-size) (/ elmo-pop3-total-size 100))))))
 
 (defun elmo-pop3-auth-user (session)
   (let ((process (elmo-network-session-process-internal session)))