Mark block/char devices the same as sockets in dired

* lisp/dired.el (dired-re-socket): Also mark block and char
devices with the socket face (bug#24547).

diff --git a/etc/NEWS b/etc/NEWS
index d876c95e68c667830e653288efcc58a7bee83f6e..e79a6ec99747510e2f7b2f319b585d8591eecf05 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -651,6 +651,10 @@ remapped to these, respectively.
 *** The marking commands now report how many files were marked by the
 command itself, not how many files are marked in total.
 
+---
+*** A new face, `dired-socket', is used to highlight sockets, names
+pipes, block devices and character devices.
+
 ** Find-Dired
 
 *** New customizable variable 'find-dired-refine-function'.

diff --git a/lisp/dired.el b/lisp/dired.el
index d67d92dc57d0e47ddb0ac53acf69c15362bac596..738d5fc111ab58848892f618bca2c72e06e13547 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -340,7 +340,8 @@ The directory name must be absolute, but need not be fully expanded.")
 ;; DOS/Windows-style drive letters in directory names, like in "d:/foo".
 (defvar dired-re-dir (concat dired-re-maybe-mark dired-re-inode-size "d[^:]"))
 (defvar dired-re-sym (concat dired-re-maybe-mark dired-re-inode-size "l[^:]"))
-(defvar dired-re-socket (concat dired-re-maybe-mark dired-re-inode-size "[sp][^:]"))
+(defvar dired-re-socket (concat dired-re-maybe-mark dired-re-inode-size
+                                "[bcsp][^:]"))
 (defvar dired-re-exe;; match ls permission string of an executable file
   (mapconcat (lambda (x)
                (concat dired-re-maybe-mark dired-re-inode-size x))
@@ -448,7 +449,7 @@ Subexpression 2 must end right before the \\n.")
 
 (defface dired-socket
   '((t (:inherit font-lock-variable-name-face)))
-  "Face used for sockets and pipes."
+  "Face used for sockets, pipes, block devices and char devices."
   :group 'dired-faces
   :version "27.1")
 
@@ -507,7 +508,7 @@ Subexpression 2 must end right before the \\n.")
    (list dired-re-sym
         '(".+" (dired-move-to-filename) nil (0 dired-symlink-face)))
    ;;
-   ;; Sockets and pipes
+   ;; Sockets, pipes, block devices, char devices.
    (list dired-re-socket
         '(".+" (dired-move-to-filename) nil (0 'dired-socket)))
    ;;