summaryrefslogtreecommitdiff
path: root/lisp/url/url-http.el
diff options
context:
space:
mode:
authorLeo Liu <sdl.web@gmail.com>2013-09-29 09:37:03 +0800
committerLeo Liu <sdl.web@gmail.com>2013-09-29 09:37:03 +0800
commit0bf29ba6175b2866fcab4015e865e5008904ed6e (patch)
treee6bd546aa2eaf761f02066396ddd40827f3f6ab8 /lisp/url/url-http.el
parentf046996ea0be2a757297541fab740d306dc087f6 (diff)
downloademacs-0bf29ba6175b2866fcab4015e865e5008904ed6e.tar.gz
* url/url-util.el (url-pretty-length): Make obsolete and all uses
changed to file-size-human-readable.
Diffstat (limited to 'lisp/url/url-http.el')
-rw-r--r--lisp/url/url-http.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index e2a2033e527..eac85ffa8f1 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -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)))