[Emacs-diffs] master f986269: * lisp/dired.el (dired-special): Rename face from dired-socket (bug#24547).

[Juri Linkov]

branch: master
commit f986269fe8e56210c0d1ca69fb5f4320e66e2736
Author: Juri Linkov <address@hidden>
Commit: Juri Linkov <address@hidden>

    * lisp/dired.el (dired-special): Rename face from dired-socket (bug#24547).
    
    (dired-re-special): Rename from dired-re-socket.
---
 etc/NEWS      |  2 +-
 lisp/dired.el | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/etc/NEWS b/etc/NEWS
index 0c7e421..7b8916e 100644
--- 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 c311769..854bc9f 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.")
 ;; 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 .