Commit 0bf29ba6 authored by Leo Liu's avatar Leo Liu
Browse files

* url/url-util.el (url-pretty-length): Make obsolete and all uses

changed to file-size-human-readable.
parent f046996e
2013-09-29 Leo Liu <sdl.web@gmail.com>
* url-util.el (url-pretty-length): Make obsolete and all uses
changed to file-size-human-readable.
2013-09-18 Glenn Morris <rgm@gnu.org>
* url-http.el (zlib-decompress-region): Declare.
......
......@@ -51,7 +51,6 @@
(defvar url-show-status)
(require 'url-gw)
(require 'url-util)
(require 'url-parse)
(require 'url-cookie)
(require 'mail-parse)
......@@ -919,7 +918,7 @@ should be shown to the user."
(defun url-http-simple-after-change-function (st nd length)
;; Function used when we do NOT know how long the document is going to be
;; Just _very_ simple 'downloaded %d' type of info.
(url-lazy-message "Reading %s..." (url-pretty-length nd)))
(url-lazy-message "Reading %s..." (file-size-human-readable nd)))
(defun url-http-content-length-after-change-function (st nd length)
"Function used when we DO know how long the document is going to be.
......@@ -932,16 +931,16 @@ the callback to be triggered."
(url-percentage (- nd url-http-end-of-headers)
url-http-content-length)
url-http-content-type
(url-pretty-length (- nd url-http-end-of-headers))
(url-pretty-length url-http-content-length)
(file-size-human-readable (- nd url-http-end-of-headers))
(file-size-human-readable url-http-content-length)
(url-percentage (- nd url-http-end-of-headers)
url-http-content-length))
(url-display-percentage
"Reading... %s of %s (%d%%)"
(url-percentage (- nd url-http-end-of-headers)
url-http-content-length)
(url-pretty-length (- nd url-http-end-of-headers))
(url-pretty-length url-http-content-length)
(file-size-human-readable (- nd url-http-end-of-headers))
(file-size-human-readable url-http-content-length)
(url-percentage (- nd url-http-end-of-headers)
url-http-content-length)))
......
......@@ -211,15 +211,9 @@ Will not do anything if `url-show-status' is nil."
(setq z (1+ z)))
(substring x z nil)))
;;;###autoload
(defun url-pretty-length (n)
(cond
((< n 1024)
(format "%d bytes" n))
((< n (* 1024 1024))
(format "%dk" (/ n 1024.0)))
(t
(format "%2.2fM" (/ n (* 1024 1024.0))))))
(define-obsolete-function-alias 'url-pretty-length
'file-size-human-readable "24.4")
;;;###autoload
(defun url-display-percentage (fmt perc &rest args)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment