diff options
| author | Lars Ingebrigtsen | 2019-07-28 12:00:24 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2019-07-28 12:00:29 +0200 |
| commit | 65274ab1c96fbd4bbd6303dc6c6567f1cd2470bc (patch) | |
| tree | 214120b3576e505d15f10b491a667e4b77b225bf | |
| parent | 348a6de118b952dd1507df6139d559bf0199cfd1 (diff) | |
| download | emacs-65274ab1c96fbd4bbd6303dc6c6567f1cd2470bc.tar.gz emacs-65274ab1c96fbd4bbd6303dc6c6567f1cd2470bc.zip | |
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).
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/dired.el | 7 |
2 files changed, 8 insertions, 3 deletions
| @@ -651,6 +651,10 @@ remapped to these, respectively. | |||
| 651 | *** The marking commands now report how many files were marked by the | 651 | *** The marking commands now report how many files were marked by the |
| 652 | command itself, not how many files are marked in total. | 652 | command itself, not how many files are marked in total. |
| 653 | 653 | ||
| 654 | --- | ||
| 655 | *** A new face, `dired-socket', is used to highlight sockets, names | ||
| 656 | pipes, block devices and character devices. | ||
| 657 | |||
| 654 | ** Find-Dired | 658 | ** Find-Dired |
| 655 | 659 | ||
| 656 | *** New customizable variable 'find-dired-refine-function'. | 660 | *** New customizable variable 'find-dired-refine-function'. |
diff --git a/lisp/dired.el b/lisp/dired.el index d67d92dc57d..738d5fc111a 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -340,7 +340,8 @@ The directory name must be absolute, but need not be fully expanded.") | |||
| 340 | ;; DOS/Windows-style drive letters in directory names, like in "d:/foo". | 340 | ;; DOS/Windows-style drive letters in directory names, like in "d:/foo". |
| 341 | (defvar dired-re-dir (concat dired-re-maybe-mark dired-re-inode-size "d[^:]")) | 341 | (defvar dired-re-dir (concat dired-re-maybe-mark dired-re-inode-size "d[^:]")) |
| 342 | (defvar dired-re-sym (concat dired-re-maybe-mark dired-re-inode-size "l[^:]")) | 342 | (defvar dired-re-sym (concat dired-re-maybe-mark dired-re-inode-size "l[^:]")) |
| 343 | (defvar dired-re-socket (concat dired-re-maybe-mark dired-re-inode-size "[sp][^:]")) | 343 | (defvar dired-re-socket (concat dired-re-maybe-mark dired-re-inode-size |
| 344 | "[bcsp][^:]")) | ||
| 344 | (defvar dired-re-exe;; match ls permission string of an executable file | 345 | (defvar dired-re-exe;; match ls permission string of an executable file |
| 345 | (mapconcat (lambda (x) | 346 | (mapconcat (lambda (x) |
| 346 | (concat dired-re-maybe-mark dired-re-inode-size x)) | 347 | (concat dired-re-maybe-mark dired-re-inode-size x)) |
| @@ -448,7 +449,7 @@ Subexpression 2 must end right before the \\n.") | |||
| 448 | 449 | ||
| 449 | (defface dired-socket | 450 | (defface dired-socket |
| 450 | '((t (:inherit font-lock-variable-name-face))) | 451 | '((t (:inherit font-lock-variable-name-face))) |
| 451 | "Face used for sockets and pipes." | 452 | "Face used for sockets, pipes, block devices and char devices." |
| 452 | :group 'dired-faces | 453 | :group 'dired-faces |
| 453 | :version "27.1") | 454 | :version "27.1") |
| 454 | 455 | ||
| @@ -507,7 +508,7 @@ Subexpression 2 must end right before the \\n.") | |||
| 507 | (list dired-re-sym | 508 | (list dired-re-sym |
| 508 | '(".+" (dired-move-to-filename) nil (0 dired-symlink-face))) | 509 | '(".+" (dired-move-to-filename) nil (0 dired-symlink-face))) |
| 509 | ;; | 510 | ;; |
| 510 | ;; Sockets and pipes | 511 | ;; Sockets, pipes, block devices, char devices. |
| 511 | (list dired-re-socket | 512 | (list dired-re-socket |
| 512 | '(".+" (dired-move-to-filename) nil (0 'dired-socket))) | 513 | '(".+" (dired-move-to-filename) nil (0 'dired-socket))) |
| 513 | ;; | 514 | ;; |