Add -face to the names of a few faces we've defined

Naming consistency is a good thing.

Author: bbatsov

cider-debug.el

@@ -57,7 +57,7 @@
   :group 'cider-debug
   :package-version '(cider . "0.10.0"))
 
-(defface cider-enlightened
+(defface cider-enlightened-face
   '((((class color) (background light)) :inherit cider-result-overlay-face
      :box (:color "darkorange" :line-width -1))
     (((class color) (background dark))  :inherit cider-result-overlay-face
@@ -67,7 +67,7 @@
   :group 'cider-debug
   :package-version '(cider . "0.11.0"))
 
-(defface cider-enlightened-local
+(defface cider-enlightened-local-face
   '((((class color) (background light)) :weight bold :foreground "darkorange")
     (((class color) (background dark))  :weight bold :foreground "yellow"))
   "Face used to mark enlightened locals (not their values)."
@@ -647,15 +647,15 @@ displaying its value."
                 (cider--make-result-overlay (cider-font-lock-as-clojure debug-value)
                   :where (cons marker marker)
                   :type 'enlighten
-                  :prepend-face 'cider-enlightened)
+                  :prepend-face 'cider-enlightened-face)
               ;; Enlightening a symbol uses a more abbreviated format. The
               ;; result face is the same as a regular result, but we also color
-              ;; the symbol with `cider-enlightened-local'.
+              ;; the symbol with `cider-enlightened-local-face'.
               (cider--make-result-overlay (cider-font-lock-as-clojure debug-value)
                 :format "%s"
                 :where (cons (point) marker)
                 :type 'enlighten
-                'face 'cider-enlightened-local))))))))
+                'face 'cider-enlightened-local-face))))))))
 
 
 ;;; Move here command

cider-mode.el

@@ -388,7 +388,8 @@ that should be font-locked:
    `macro' (default): Any defined macro gets the `font-lock-builtin-face'.
    `function': Any defined function gets the `font-lock-function-face'.
    `var': Any non-local var gets the `font-lock-variable-face'.
-   `deprecated' (default): Any deprecated var gets the `cider-deprecated' face.
+   `deprecated' (default): Any deprecated var gets the `cider-deprecated-face'
+   face.
    `core' (default): Any symbol from clojure.core (face depends on type).
 
 The value can also be t, which means to font-lock as much as possible."
@@ -402,7 +403,7 @@ The value can also be t, which means to font-lock as much as possible."
   :group 'cider
   :package-version '(cider . "0.10.0"))
 
-(defface cider-deprecated
+(defface cider-deprecated-face
   '((((background light)) :background "light goldenrod")
     (((background dark)) :background "#432"))
   "Face used on deprecated vars."
@@ -483,10 +484,10 @@ The value can also be t, which means to font-lock as much as possible."
              (cider--unless-local-match font-lock-variable-name-face))))
       ,@(when deprecated
           `((,(regexp-opt deprecated 'symbols) 0
-             (cider--unless-local-match 'cider-deprecated) append)))
+             (cider--unless-local-match 'cider-deprecated-face) append)))
       ,@(when enlightened
           `((,(regexp-opt enlightened 'symbols) 0
-             (cider--unless-local-match 'cider-enlightened) append)))
+             (cider--unless-local-match 'cider-enlightened-face) append)))
       ,@(when instrumented
           `((,(regexp-opt instrumented 'symbols) 0
              (cider--unless-local-match 'cider-instrumented-face) append)))