[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 17872ba 157/167: ivy.el: Structure all faces into ivy-face
From: |
Oleh Krehel |
Subject: |
[elpa] master 17872ba 157/167: ivy.el: Structure all faces into ivy-faces custom group |
Date: |
Tue, 08 Dec 2015 10:50:42 +0000 |
branch: master
commit 17872bafcc3a5ff1892e7006104aa27266a4bd17
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el: Structure all faces into ivy-faces custom group
---
ivy.el | 71 +++++++++++++++++++++++++++++++++++----------------------------
1 files changed, 39 insertions(+), 32 deletions(-)
diff --git a/ivy.el b/ivy.el
index 5b0d2c2..f2cd67f 100644
--- a/ivy.el
+++ b/ivy.el
@@ -44,12 +44,44 @@
"Incremental vertical completion."
:group 'convenience)
+(defgroup ivy-faces nil
+ "Font-lock faces for `ivy'."
+ :group 'ivy)
+
(defface ivy-current-match
'((((class color) (background light))
:background "#1a4b77" :foreground "white")
(((class color) (background dark))
:background "#65a7e2" :foreground "black"))
- "Face used by Ivy for highlighting first match.")
+ "Face used by Ivy for highlighting the current match.")
+
+(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.")
(defface ivy-confirm-face
'((t :foreground "ForestGreen" :inherit minibuffer-prompt))
@@ -59,6 +91,8 @@
'((t :foreground "red" :inherit minibuffer-prompt))
"Face used by Ivy for a match required prompt.")
+(setcdr (assoc load-file-name custom-current-group-alist) 'ivy)
+
(defface ivy-subdir
'((t (:inherit 'dired-directory)))
"Face used by Ivy for highlighting subdirs in the alternatives.")
@@ -71,6 +105,10 @@
'((t (:foreground "#110099")))
"Face used by Ivy for highlighting remotes in the alternatives.")
+(defface ivy-virtual
+ '((t :inherit font-lock-builtin-face))
+ "Face used by Ivy for matching virtual buffer names.")
+
(defcustom ivy-height 10
"Number of lines for the minibuffer window."
:type 'integer)
@@ -1953,34 +1991,6 @@ SEPARATOR is used to join the candidates."
cand-pairs
""))
-(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
@@ -2066,9 +2076,6 @@ CANDS is a list of strings."
(defvar recentf-list)
-(defface ivy-virtual '((t :inherit font-lock-builtin-face))
- "Face used by Ivy for matching virtual buffer names.")
-
(defcustom ivy-virtual-abbreviate 'name
"The mode of abbreviation for virtual buffer names."
:type '(choice
- [elpa] master 1cceac1 154/167: Fix ivy-resume issue caused by the recursive calls change, (continued)
- [elpa] master 1cceac1 154/167: Fix ivy-resume issue caused by the recursive calls change, Oleh Krehel, 2015/12/08
- [elpa] master ed9169d 158/167: swiper.el (swiper--update-input-ivy): Add a work-around for "M-j", Oleh Krehel, 2015/12/08
- [elpa] master 0332b3e 151/167: Remove 'field text property for twittering-mode, Oleh Krehel, 2015/12/08
- [elpa] master 5cfe6e6 148/167: Fixes on the previous docstring edits, Oleh Krehel, 2015/12/08
- [elpa] master 435e9d4 159/167: Use :caller for ivy-re-builders-alist, Oleh Krehel, 2015/12/08
- [elpa] master 8dd88e4 149/167: doc/Changelog.org: Update up to 2bec99d, Oleh Krehel, 2015/12/08
- [elpa] master 706349f 160/167: swiper.el (swiper-font-lock-ensure): Add vc-dir-mode, Oleh Krehel, 2015/12/08
- [elpa] master 2a55ada 163/167: doc/Changelog.org: Update up to 706349f, Oleh Krehel, 2015/12/08
- [elpa] master 98a4548 164/167: swiper.el: Bump version to 0.7.0, Oleh Krehel, 2015/12/08
- [elpa] master 84533bb 139/167: Minor fixes to ivy.org and export to ivy.texi, Oleh Krehel, 2015/12/08
- [elpa] master 17872ba 157/167: ivy.el: Structure all faces into ivy-faces custom group,
Oleh Krehel <=
- [elpa] master 5a6217a 161/167: counsel.el (counsel-tmm): New command, Oleh Krehel, 2015/12/08
- [elpa] master e264139 166/167: doc/ivy.org: Add "Variable Index" node, Oleh Krehel, 2015/12/08
- [elpa] master c5661c0 162/167: ivy.el (ivy-completing-read): Use completing-read-default for tmm, Oleh Krehel, 2015/12/08
- [elpa] master 1992f44 165/167: doc/ivy.texi: Re-export using adjusted texinfo exporter, Oleh Krehel, 2015/12/08
- [elpa] master 1f3fa31 167/167: Merge commit 'e264139e7fafbd1bbb68f9cef6d1c50b8e6cf1f3' from swiper, Oleh Krehel, 2015/12/08