diff options
author | Mattias EngdegÄrd <mattiase@acm.org> | 2019-07-22 17:10:37 +0200 |
---|---|---|
committer | Mattias EngdegÄrd <mattiase@acm.org> | 2019-08-02 12:38:44 +0200 |
commit | 408e75e819f70ed47000bc31b34435a4bad33c0c (patch) | |
tree | d39724241aa7e9cb463c80124c751c46bab36a98 /lisp/url | |
parent | b49d987a8cf5f5dd7ba864e20995e21765eaefcf (diff) | |
download | emacs-408e75e819f70ed47000bc31b34435a4bad33c0c.tar.gz |
Clean up file-size-function
It is now called `byte-count-to-string-function', and used instead of
calling `file-size-human-readable' directly where appropriate.
* lisp/files.el (file-size-human-readable-iec): New.
(file-size-function): Rename to byte-count-to-string-function. Better
default value. Eliminate lambda. Better default for custom choice.
Put in group `files'. More descriptive doc string. Move.
(out-of-memory-warning-percentage, warn-maybe-out-of-memory)
(get-free-disk-space):
* lisp/dired.el (dired-number-of-marked-files):
* lisp/url/url-http.el (url-http-simple-after-change-function)
(url-http-content-length-after-change-function):
Use byte-count-to-string-function.
* test/lisp/files-test.el (files-test-file-size-human-readable):
Test file-size-human-readable-iec.
Diffstat (limited to 'lisp/url')
-rw-r--r-- | lisp/url/url-http.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 838f0a30c1f..9b690778fc0 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -1025,7 +1025,7 @@ should be shown to the user." ;; 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..." - (file-size-human-readable (buffer-size) 'iec " "))) + (funcall byte-count-to-string-function (buffer-size)))) (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. @@ -1038,16 +1038,16 @@ the callback to be triggered." (url-percentage (- nd url-http-end-of-headers) url-http-content-length) url-http-content-type - (file-size-human-readable (- nd url-http-end-of-headers) 'iec " ") - (file-size-human-readable url-http-content-length 'iec " ") + (funcall byte-count-to-string-function (- nd url-http-end-of-headers)) + (funcall byte-count-to-string-function 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) - (file-size-human-readable (- nd url-http-end-of-headers) 'iec " ") - (file-size-human-readable url-http-content-length 'iec " ") + (funcall byte-count-to-string-function (- nd url-http-end-of-headers)) + (funcall byte-count-to-string-function url-http-content-length) (url-percentage (- nd url-http-end-of-headers) url-http-content-length))) |