From 0bf29ba6175b2866fcab4015e865e5008904ed6e Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sun, 29 Sep 2013 09:37:03 +0800 Subject: [PATCH] * url/url-util.el (url-pretty-length): Make obsolete and all uses changed to file-size-human-readable. --- lisp/url/ChangeLog | 5 +++++ lisp/url/url-http.el | 11 +++++------ lisp/url/url-util.el | 12 +++--------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 7619f2e2b86..0c7cd1ef64e 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2013-09-29 Leo Liu + + * url-util.el (url-pretty-length): Make obsolete and all uses + changed to file-size-human-readable. + 2013-09-18 Glenn Morris * url-http.el (zlib-decompress-region): Declare. 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))) diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index c40768ba42a..f995d575b6a 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -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) -- 2.39.2