bug#22255: 25.1.50; directories not recognized if dired-actual-switches has: -lsh

bug#22255: 25.1.50; directories not recognized if dired-actual-switches has: -lsh

[Tino Calancha]

dired-re-dir dont expect human readable format in the file system block size.
If we set dired-actual-switches -lsh, with gnu ls, diredp-next-dirline 
fails whenever the block size contains size units.

emacs -Q:

(let ((default "  15204787   4 drwxr-xr-x  2 user group   4096 Dec  28 17:53 .emacs.d")
       (human "  15204787 4.0K drwxr-xr-x  2 user group 4.0K Dec  28 17:53 .emacs.d"))
   (require 'dired)
   (if (string-match dired-re-dir default)
       (insert (format "default match dired-re-dir\n"))
     (insert (format "default DOESN'T match dired-re-dir\n")))
   (if (string-match dired-re-dir human)
     (insert (format "human match dired-re-dir\n"))
     (insert (format "human DOESN'T match dired-re-dir\n"))))
default match dired-re-dir
human DOESN'T match dired-re-dir

We may fix this modifying dired-re-inode-size to recognize human readable sizes.


In GNU Emacs 25.1.50.1 (x86_64-pc-linux-gnu, GTK+ Version 2.24.28)
  of 2015-11-28
Repository revision: c42ccd615081e12c97a55e778b488b3f4f5b22b7
Windowing system distributor 'The X.Org Foundation', version 11.0.11703000
System Description:	Debian GNU/Linux testing (stretch)

bug#22255: 25.1.50; Dired: Handle dired-actual-switches: -lsh

[Tino Calancha]

emacs -Q ~
C-u s sh RET
;; Directories are not recognized: wrong fontification.
>
;;dired-next-dirline: No more subdirectories

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

From 9c9a3477bb53f24a12c82c86eb1edf269c4b3fac Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Tue, 28 Jun 2016 13:10:11 +0900
Subject: [PATCH] Handle human readable units in the file size

* lisp/dired.el (dired-re-inode-size): (Bug#22255).
---
  lisp/dired.el | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/dired.el b/lisp/dired.el
index 38979b5..d078478 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -303,7 +303,7 @@ dired-actual-switches

  (put 'dired-actual-switches 'safe-local-variable 'dired-safe-switches-p)

-(defvar dired-re-inode-size "[0-9 \t]*"
+(defvar dired-re-inode-size "[0-9  \t]*[.,0-9]*[BkKMGTPEZY]?[ \t]*"
    "Regexp for optional initial inode and file size as made by `ls -i 
-s'.")

  ;; These regexps must be tested at beginning-of-line, but are also
-- 
2.8.1


In GNU Emacs 25.1.50.1 (x86_64-pc-linux-gnu, GTK+ Version 3.20.6)
Repository revision: cfb3c61f1ffec9a6322407fdd228d5cc31c31ed0

bug#22255: 25.1.50; Dired: Handle dired-actual-switches: -lsh

[Eli Zaretskii]

> From: Tino Calancha <f92capac@gmail.com>
> Date: Tue, 28 Jun 2016 13:25:13 +0900 (JST)
> 
> 
> emacs -Q ~
> C-u s sh RET
> ;; Directories are not recognized: wrong fontification.
> >
> ;;dired-next-dirline: No more subdirectories
> 
> ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
> 
> >From 9c9a3477bb53f24a12c82c86eb1edf269c4b3fac Mon Sep 17 00:00:00 2001
> From: Tino Calancha <tino.calancha@gmail.com>
> Date: Tue, 28 Jun 2016 13:10:11 +0900
> Subject: [PATCH] Handle human readable units in the file size

Looks good to me, thanks.

> * lisp/dired.el (dired-re-inode-size): (Bug#22255).

Please provide a more descriptive log message, which actually
describes what and how is being changed.

bug#22255: (no subject)

[Tino Calancha]

Fixed in master branch updating 'dired-re-inode-size'