bug#5762: 24.0.50; Show available disk space with -h option when using ls with -h option

[Thierry Volpiatto <thierry.volpiatto@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1195 bytes --]

Thierry Volpiatto <thierry.volpiatto@gmail.com> writes:

> Hi,
> in dired when using `dired-listing-switches' with -h option, the second
> line of dired buffer is like:
>
> total used in directory 24M available 19275100
>
> it should show:
>
> total used in directory 24M available 19G
>
> I suggest to modify `insert-directory' like this:
>
> ,----[ files.el (insert-directory) ]
> | [....]
> | (let* ((directory-free-space-args (if (string-match "h" dired-listing-switches)
> |                                       (concat directory-free-space-args "h")
> |                                       directory-free-space-args))
> |        (available (get-free-disk-space ".")))
> |   (when (re-search-forward "^ *\\(total\\)" nil t)
> |     (when available
> |       ;; Replace "total" with "used", to avoid confusion.
> |       (replace-match "total used in directory" nil nil nil 1)
> |       (end-of-line)
> |       (insert " available " available))))))))))
> `----
>
> Find a patch attached.

Even better is to parse `dired-actual-switches', like that it update
correctly when using C-u s in dired.

Find the precedent patch modified here.

-- 
Thierry Volpiatto
Gpg key: http://pgp.mit.edu/

[-- Attachment #2: patch-r107473 --]
[-- Type: application/octet-stream, Size: 1735 bytes --]

# HG changeset patch
# User Thierry Volpiatto <thierry.volpiatto@gmail.com>
# Date 1269415422 -3600
# Node ID 6a3555ebe64174aeea55f8cce725ef68f328fdd8
# Parent  7cceab93f61c48239c690c8bf8abe0e34c64e746
files.el (insert-directory): Use -h option in `directory-free-space-args' when using -h option in `dired-listing-switches'.

diff --git a/lisp/files.el b/lisp/files.el
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5891,13 +5891,17 @@
 	      (save-excursion
 		(goto-char beg)
 		;; First find the line to put it on.
-		(when (re-search-forward "^ *\\(total\\)" nil t)
-		  (let ((available (get-free-disk-space ".")))
-		    (when available
-		      ;; Replace "total" with "used", to avoid confusion.
-		      (replace-match "total used in directory" nil nil nil 1)
-		      (end-of-line)
-		      (insert " available " available))))))))))
+                ;(when (re-search-forward "^ *\\(total\\)" nil t)
+                (let* ((directory-free-space-args (if (string-match "h" dired-actual-switches)
+                                                      (concat directory-free-space-args "h")
+                                                      directory-free-space-args))
+                       (available (get-free-disk-space ".")))
+                  (when (re-search-forward "^ *\\(total\\)" nil t)
+                    (when available
+                      ;; Replace "total" with "used", to avoid confusion.
+                      (replace-match "total used in directory" nil nil nil 1)
+                      (end-of-line)
+                      (insert " available " available))))))))))
 
 (defun insert-directory-adj-pos (pos error-lines)
   "Convert `ls --dired' file name position value POS to a buffer position.