From: Tino Calancha Date: Sat, 15 Jul 2017 15:30:56 +0000 (+0900) Subject: ls-lisp: Fix file size format X-Git-Tag: emacs-26.0.90~518^2~92 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66683f46b877a8c2baa5fdedfb332618a1973db5;p=emacs.git ls-lisp: Fix file size format * lisp/ls-lisp.el (ls-lisp-filesize-d-fmt, ls-lisp-filesize-f-fmt) (ls-lisp-filesize-b-fmt): Add space in front (Bug#27693). * test/lisp/dired-tests.el (dired-test-bug27693): Add test. --- diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 7ae23434415..b368efbbc95 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -245,11 +245,11 @@ to fail to line up, e.g. if month names are not all of the same length." "Format to display integer GIDs.") (defvar ls-lisp-gid-s-fmt " %s" "Format to display user group names.") -(defvar ls-lisp-filesize-d-fmt "%d" +(defvar ls-lisp-filesize-d-fmt " %d" "Format to display integer file sizes.") -(defvar ls-lisp-filesize-f-fmt "%.0f" +(defvar ls-lisp-filesize-f-fmt " %.0f" "Format to display float file sizes.") -(defvar ls-lisp-filesize-b-fmt "%.0f" +(defvar ls-lisp-filesize-b-fmt " %.0f" "Format to display file sizes in blocks (for the -s switch).") ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/test/lisp/dired-tests.el b/test/lisp/dired-tests.el index 1b814baac58..208e1c25091 100644 --- a/test/lisp/dired-tests.el +++ b/test/lisp/dired-tests.el @@ -84,5 +84,17 @@ (advice-remove 'dired-query "advice-dired-query") (advice-remove 'completing-read "advice-completing-read")))) +(ert-deftest dired-test-bug27693 () + "Test for http://debbugs.gnu.org/27693 ." + (require 'ls-lisp) + (let ((size "") + ls-lisp-use-insert-directory-program) + (dired (list (expand-file-name "lisp" source-directory) "simple.el" "subr.el")) + (setq size (number-to-string + (file-attribute-size + (file-attributes (dired-get-filename))))) + (search-backward-regexp size nil t) + (should (looking-back "[[:space:]]" (1- (point)))))) + (provide 'dired-tests) ;; dired-tests.el ends here