aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/NEWS2
-rw-r--r--lisp/dired.el10
2 files changed, 6 insertions, 6 deletions
diff --git a/etc/NEWS b/etc/NEWS
index 0c7e421ed9c..7b8916edd69 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -658,7 +658,7 @@ remapped to these, respectively.
658command itself, not how many files are marked in total. 658command itself, not how many files are marked in total.
659 659
660--- 660---
661*** A new face, 'dired-socket', is used to highlight sockets, named 661*** A new face, 'dired-special', is used to highlight sockets, named
662pipes, block devices and character devices. 662pipes, block devices and character devices.
663 663
664** Find-Dired 664** Find-Dired
diff --git a/lisp/dired.el b/lisp/dired.el
index c31176972fc..854bc9f7d7e 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -340,8 +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 343(defvar dired-re-special (concat dired-re-maybe-mark dired-re-inode-size
344 "[bcsp][^:]")) 344 "[bcsp][^:]"))
345(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
346 (mapconcat (lambda (x) 346 (mapconcat (lambda (x)
347 (concat dired-re-maybe-mark dired-re-inode-size x)) 347 (concat dired-re-maybe-mark dired-re-inode-size x))
@@ -447,7 +447,7 @@ Subexpression 2 must end right before the \\n.")
447(defvar dired-symlink-face 'dired-symlink 447(defvar dired-symlink-face 'dired-symlink
448 "Face name used for symbolic links.") 448 "Face name used for symbolic links.")
449 449
450(defface dired-socket 450(defface dired-special
451 '((t (:inherit font-lock-variable-name-face))) 451 '((t (:inherit font-lock-variable-name-face)))
452 "Face used for sockets, pipes, block devices and char devices." 452 "Face used for sockets, pipes, block devices and char devices."
453 :group 'dired-faces 453 :group 'dired-faces
@@ -509,8 +509,8 @@ Subexpression 2 must end right before the \\n.")
509 '(".+" (dired-move-to-filename) nil (0 dired-symlink-face))) 509 '(".+" (dired-move-to-filename) nil (0 dired-symlink-face)))
510 ;; 510 ;;
511 ;; Sockets, pipes, block devices, char devices. 511 ;; Sockets, pipes, block devices, char devices.
512 (list dired-re-socket 512 (list dired-re-special
513 '(".+" (dired-move-to-filename) nil (0 'dired-socket))) 513 '(".+" (dired-move-to-filename) nil (0 'dired-special)))
514 ;; 514 ;;
515 ;; Files suffixed with `completion-ignored-extensions'. 515 ;; Files suffixed with `completion-ignored-extensions'.
516 '(eval . 516 '(eval .