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

changed to file-size-human-readable.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 7619f2e2b86ee6be7f93a8560e88290bca67b929..0c7cd1ef64e8999f83d79d79bf276414b2784b3b 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index e2a2033e5277023954ddb087f478d84f7c5fd237..eac85ffa8f1848a8bb044978d305918f15bce086 100644 (file)
--- 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 c40768ba42af522f1939e65f25ece89ab72547b2..f995d575b6a43a545e9e931c583da6b3eca6be65 100644 (file)
--- 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)