* lisp/dired.el (dired-special): Rename face from dired-socket (bug#24547).

(dired-re-special): Rename from dired-re-socket.

diff --git a/etc/NEWS b/etc/NEWS
index 0c7e421ed9c36ca77b0b9e4d28eff6fee2b9527e..7b8916edd69bcc0a48bd6316eadb323633f2c27d 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -658,7 +658,7 @@ remapped to these, respectively.
 command itself, not how many files are marked in total.
 
 ---
-*** A new face, 'dired-socket', is used to highlight sockets, named
+*** A new face, 'dired-special', is used to highlight sockets, named
 pipes, block devices and character devices.
 
 ** Find-Dired

diff --git a/lisp/dired.el b/lisp/dired.el
index c31176972fcd4a9e1d7fd7ff853a436cf671264c..854bc9f7d7e0148e45f71dd308a4dea66576ffd9 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -340,8 +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
-                                "[bcsp][^:]"))
+(defvar dired-re-special (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))
@@ -447,7 +447,7 @@ Subexpression 2 must end right before the \\n.")
 (defvar dired-symlink-face 'dired-symlink
   "Face name used for symbolic links.")
 
-(defface dired-socket
+(defface dired-special
   '((t (:inherit font-lock-variable-name-face)))
   "Face used for sockets, pipes, block devices and char devices."
   :group 'dired-faces
@@ -509,8 +509,8 @@ Subexpression 2 must end right before the \\n.")
         '(".+" (dired-move-to-filename) nil (0 dired-symlink-face)))
    ;;
    ;; Sockets, pipes, block devices, char devices.
-   (list dired-re-socket
-        '(".+" (dired-move-to-filename) nil (0 'dired-socket)))
+   (list dired-re-special
+        '(".+" (dired-move-to-filename) nil (0 'dired-special)))
    ;;
    ;; Files suffixed with `completion-ignored-extensions'.
    '(eval .