[elpa] master dc84ba3 070/167: Rename and move the minibuffer faces

[Oleh Krehel]

branch: master
commit dc84ba356c43f6aee0e3edfa900abbefa2cb4e31
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    Rename and move the minibuffer faces
    
    * swiper.el (swiper-minibuffer-match-face-1):
    (swiper-minibuffer-match-face-2):
    (swiper-minibuffer-match-face-3):
    (swiper-minibuffer-match-face-4): Transform into obsolete aliases.
    
    * ivy.el (ivy-minibuffer-match-face-1):
    (ivy-minibuffer-match-face-2):
    (ivy-minibuffer-match-face-3):
    (ivy-minibuffer-match-face-4): New renamed faces.
    (ivy-minibuffer-faces): Rename from `swiper-minibuffer-faces'.
    
    Fixes #276
---
 ivy.el    |   48 ++++++++++++++++++++++++++++++++++++++----------
 swiper.el |   41 ++++++++++++-----------------------------
 2 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/ivy.el b/ivy.el
index b6715c9..3ae9abc 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1762,12 +1762,40 @@ This string will be inserted into the minibuffer.")
                s))
      cands "\n")))
 
-(defcustom swiper-minibuffer-faces
-  '(swiper-minibuffer-match-face-1
-    swiper-minibuffer-match-face-2
-    swiper-minibuffer-match-face-3
-    swiper-minibuffer-match-face-4)
-  "List of `swiper' faces for minibuffer group matches.")
+(defface ivy-minibuffer-match-face-1
+  '((((class color) (background light))
+     :background "#d3d3d3")
+    (((class color) (background dark))
+     :background "#555555"))
+  "The background face for `ivy' minibuffer matches.")
+
+(defface ivy-minibuffer-match-face-2
+  '((((class color) (background light))
+     :background "#e99ce8" :weight bold)
+    (((class color) (background dark))
+     :background "#777777" :weight bold))
+  "Face for `ivy' minibuffer matches modulo 1.")
+
+(defface ivy-minibuffer-match-face-3
+  '((((class color) (background light))
+     :background "#bbbbff" :weight bold)
+    (((class color) (background dark))
+     :background "#7777ff" :weight bold))
+  "Face for `ivy' minibuffer matches modulo 2.")
+
+(defface ivy-minibuffer-match-face-4
+  '((((class color) (background light))
+     :background "#ffbbff" :weight bold)
+    (((class color) (background dark))
+     :background "#8a498a" :weight bold))
+  "Face for `ivy' minibuffer matches modulo 3.")
+
+(defcustom ivy-minibuffer-faces
+  '(ivy-minibuffer-match-face-1
+    ivy-minibuffer-match-face-2
+    ivy-minibuffer-match-face-3
+    ivy-minibuffer-match-face-4)
+  "List of `ivy' faces for minibuffer group matches.")
 
 (defun ivy--format-minibuffer-line (str)
   (let ((start 0)
@@ -1782,12 +1810,12 @@ This string will be inserted into the minibuffer.")
           (while (<= i ivy--subexps)
             (let ((face
                    (cond ((zerop ivy--subexps)
-                          (cadr swiper-minibuffer-faces))
+                          (cadr ivy-minibuffer-faces))
                          ((zerop i)
-                          (car swiper-minibuffer-faces))
+                          (car ivy-minibuffer-faces))
                          (t
-                          (nth (1+ (mod (+ i 2) (1- (length 
swiper-minibuffer-faces))))
-                               swiper-minibuffer-faces)))))
+                          (nth (1+ (mod (+ i 2) (1- (length 
ivy-minibuffer-faces))))
+                               ivy-minibuffer-faces)))))
               (if (fboundp 'add-face-text-property)
                   (add-face-text-property
                    (match-beginning i)
diff --git a/swiper.el b/swiper.el
index 8793502..607108c 100644
--- a/swiper.el
+++ b/swiper.el
@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <address@hidden>
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.5.1
+;; Version: 0.6.0
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: matching
 
@@ -61,34 +61,17 @@
   '((t (:inherit isearch-fail)))
   "Face for `swiper' matches modulo 3.")
 
-(defface swiper-minibuffer-match-face-1
-  '((((class color) (background light))
-     :background "#d3d3d3")
-    (((class color) (background dark))
-     :background "#555555"))
-  "The background face for `swiper' minibuffer matches."
-  :group 'function-args-faces)
-
-(defface swiper-minibuffer-match-face-2
-  '((((class color) (background light))
-     :background "#e99ce8" :weight bold)
-    (((class color) (background dark))
-     :background "#777777" :weight bold))
-  "Face for `swiper' minibuffer matches modulo 1.")
-
-(defface swiper-minibuffer-match-face-3
-  '((((class color) (background light))
-     :background "#bbbbff" :weight bold)
-    (((class color) (background dark))
-     :background "#7777ff" :weight bold))
-  "Face for `swiper' minibuffer matches modulo 2.")
-
-(defface swiper-minibuffer-match-face-4
-  '((((class color) (background light))
-     :background "#ffbbff" :weight bold)
-    (((class color) (background dark))
-     :background "#8a498a" :weight bold))
-  "Face for `swiper' minibuffer matches modulo 3.")
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-1
+    'ivy-minibuffer-match-face-1 "0.6.0")
+
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-2
+    'ivy-minibuffer-match-face-2 "0.6.0")
+
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-3
+    'ivy-minibuffer-match-face-3 "0.6.0")
+
+(define-obsolete-face-alias 'swiper-minibuffer-match-face-4
+    'ivy-minibuffer-match-face-4 "0.6.0")
 
 (defface swiper-line-face
   '((t (:inherit highlight)))