[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy-hydra 9fddf44 297/395: ivy-faces.el: Extract
From: |
Basil L. Contovounesios |
Subject: |
[elpa] externals/ivy-hydra 9fddf44 297/395: ivy-faces.el: Extract |
Date: |
Thu, 25 Feb 2021 08:32:24 -0500 (EST) |
branch: externals/ivy-hydra
commit 9fddf44d7d3083a6689fa0d2b95ace2401ec4b1c
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>
ivy-faces.el: Extract
---
Makefile | 2 +-
ivy-faces.el | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ivy.el | 117 +-------------------------------------------------
3 files changed, 141 insertions(+), 116 deletions(-)
diff --git a/Makefile b/Makefile
index 8cf9c54..c66b6c1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ checkdoc:
$(emacs) -batch -l targets/checkdoc.el
compile:
- $(emacs) -batch -L . -f batch-byte-compile colir.el ivy-overlay.el
ivy.el swiper.el counsel.el
+ $(emacs) -batch -L . -f batch-byte-compile colir.el ivy-faces.el
ivy-overlay.el ivy.el swiper.el counsel.el
plain:
$(emacs) --version
diff --git a/ivy-faces.el b/ivy-faces.el
new file mode 100644
index 0000000..54492c4
--- /dev/null
+++ b/ivy-faces.el
@@ -0,0 +1,138 @@
+;;; ivy-faces.el --- Faces for Ivy -*- lexical-binding: t -*-
+
+;; Copyright (C) 2020 Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel <ohwoeowho@gmail.com>
+;; Keywords: convenience
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
+(defgroup ivy-faces nil
+ "Font-lock faces for `ivy'."
+ :group 'ivy
+ :group 'faces)
+
+(defface ivy-current-match
+ '((((class color) (background light))
+ :background "#1a4b77" :foreground "white" :extend t)
+ (((class color) (background dark))
+ :background "#65a7e2" :foreground "black" :extend t))
+ "Face used by Ivy for highlighting the current match.")
+
+(defface ivy-minibuffer-match-highlight
+ '((t :inherit highlight))
+ "Face used by Ivy for highlighting the match under the cursor.")
+
+(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 numbered 1 modulo 3.")
+
+(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 numbered 2 modulo 3.")
+
+(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 numbered 3 modulo 3.")
+
+(defface ivy-confirm-face
+ '((t :foreground "ForestGreen" :inherit minibuffer-prompt))
+ "Face used by Ivy for a confirmation prompt.")
+
+(defface ivy-match-required-face
+ '((t :foreground "red" :inherit minibuffer-prompt))
+ "Face used by Ivy for a match required prompt.")
+
+(defface ivy-subdir
+ '((t :inherit dired-directory))
+ "Face used by Ivy for highlighting subdirs in the alternatives.")
+
+(defface ivy-org
+ '((t :inherit org-level-4))
+ "Face used by Ivy for highlighting Org buffers in the alternatives.")
+
+(defface ivy-modified-buffer
+ '((t :inherit default))
+ "Face used by Ivy for highlighting modified file visiting buffers.")
+
+(defface ivy-modified-outside-buffer
+ '((t :inherit default))
+ "Face used by Ivy for highlighting file visiting buffers modified outside
Emacs.")
+
+(defface ivy-remote
+ '((((class color) (background light))
+ :foreground "#110099")
+ (((class color) (background dark))
+ :foreground "#7B6BFF"))
+ "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.")
+
+(defface ivy-action
+ '((t :inherit font-lock-builtin-face))
+ "Face used by Ivy for displaying keys in `ivy-read-action'.")
+
+(defface ivy-highlight-face
+ '((t :inherit highlight))
+ "Face used by Ivy to highlight certain candidates.")
+
+(defface ivy-prompt-match
+ '((t :inherit ivy-current-match))
+ "Face used by Ivy for highlighting the selected prompt line.")
+
+(defface ivy-separator
+ '((t :inherit font-lock-doc-face))
+ "Face for multiline source separator.")
+
+(defface ivy-grep-info
+ '((t :inherit compilation-info))
+ "Face for highlighting grep information such as file names.")
+
+(defface ivy-grep-line-number
+ '((t :inherit compilation-line-number))
+ "Face for displaying line numbers in grep messages.")
+
+(defface ivy-completions-annotations
+ '((t :inherit completions-annotations))
+ "Face for displaying completion annotations.")
+
+(defface ivy-yanked-word
+ '((t :inherit highlight))
+ "Face used to highlight yanked word.")
+
+(provide 'ivy-faces)
+
+;;; ivy-faces.el ends here
diff --git a/ivy.el b/ivy.el
index 10cfc71..2025fc0 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1,6 +1,6 @@
;;; ivy.el --- Incremental Vertical completYon -*- lexical-binding: t -*-
-;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2020 Free Software Foundation, Inc.
;; Author: Oleh Krehel <ohwoeowho@gmail.com>
;; URL: https://github.com/abo-abo/swiper
@@ -40,6 +40,7 @@
(require 'colir)
(require 'ivy-overlay)
+(require 'ivy-faces)
(require 'cl-lib)
(require 'ring)
@@ -52,120 +53,6 @@
"Incremental vertical completion."
:group 'convenience)
-(defgroup ivy-faces nil
- "Font-lock faces for `ivy'."
- :group 'ivy
- :group 'faces)
-
-(defface ivy-current-match
- '((((class color) (background light))
- :background "#1a4b77" :foreground "white" :extend t)
- (((class color) (background dark))
- :background "#65a7e2" :foreground "black" :extend t))
- "Face used by Ivy for highlighting the current match.")
-
-(defface ivy-minibuffer-match-highlight
- '((t :inherit highlight))
- "Face used by Ivy for highlighting the match under the cursor.")
-
-(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 numbered 1 modulo 3.")
-
-(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 numbered 2 modulo 3.")
-
-(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 numbered 3 modulo 3.")
-
-(defface ivy-confirm-face
- '((t :foreground "ForestGreen" :inherit minibuffer-prompt))
- "Face used by Ivy for a confirmation prompt.")
-
-(defface ivy-match-required-face
- '((t :foreground "red" :inherit minibuffer-prompt))
- "Face used by Ivy for a match required prompt.")
-
-(defface ivy-subdir
- '((t :inherit dired-directory))
- "Face used by Ivy for highlighting subdirs in the alternatives.")
-
-(defface ivy-org
- '((t :inherit org-level-4))
- "Face used by Ivy for highlighting Org buffers in the alternatives.")
-
-(defface ivy-modified-buffer
- '((t :inherit default))
- "Face used by Ivy for highlighting modified file visiting buffers.")
-
-(defface ivy-modified-outside-buffer
- '((t :inherit default))
- "Face used by Ivy for highlighting file visiting buffers modified outside
Emacs.")
-
-(defface ivy-remote
- '((((class color) (background light))
- :foreground "#110099")
- (((class color) (background dark))
- :foreground "#7B6BFF"))
- "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.")
-
-(defface ivy-action
- '((t :inherit font-lock-builtin-face))
- "Face used by Ivy for displaying keys in `ivy-read-action'.")
-
-(defface ivy-highlight-face
- '((t :inherit highlight))
- "Face used by Ivy to highlight certain candidates.")
-
-(defface ivy-prompt-match
- '((t :inherit ivy-current-match))
- "Face used by Ivy for highlighting the selected prompt line.")
-
-(defface ivy-separator
- '((t :inherit font-lock-doc-face))
- "Face for multiline source separator.")
-
-(defface ivy-grep-info
- '((t :inherit compilation-info))
- "Face for highlighting grep information such as file names.")
-
-(defface ivy-grep-line-number
- '((t :inherit compilation-line-number))
- "Face for displaying line numbers in grep messages.")
-
-(defface ivy-completions-annotations
- '((t :inherit completions-annotations))
- "Face for displaying completion annotations.")
-
-(defface ivy-yanked-word
- '((t :inherit highlight))
- "Face used to highlight yanked word.")
-
-;; Set default customization `:group' to `ivy' for the rest of the file.
-(setcdr (assoc load-file-name custom-current-group-alist) 'ivy)
-
(defcustom ivy-height 10
"Number of lines for the minibuffer window.
- [elpa] externals/ivy-hydra 8989ed1 276/395: ivy.el (ivy--update-minibuffer): don't filter while there's input, (continued)
- [elpa] externals/ivy-hydra 8989ed1 276/395: ivy.el (ivy--update-minibuffer): don't filter while there's input, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra d790e53 278/395: doc/ivy.org: Mention multiple-session ivy-resume, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra fb8804d 280/395: ivy.el (ivy--call-marked): Extract, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 489bc57 284/395: counsel.el (counsel-rg-base-command): Make the default a list, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 7fd0662 285/395: counsel.el (counsel-grep-like-occur): Fix for marked files in dired, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra f1c57a1 292/395: counsel.el (counsel-async-command-delay): Set the default to 0.0, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra fb73bfe 288/395: counsel.el (counsel--rg-targets): Fix regression, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 2b26f83 289/395: counsel.el (counsel--sync-sentinel-on-exit): Don't reset index, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 6a576cb 293/395: ivy-avy.el: Extract, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra e42e0b3 295/395: ivy-hydra.el (ivy-minibuffer-grow): Move, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 9fddf44 297/395: ivy-faces.el: Extract,
Basil L. Contovounesios <=
- [elpa] externals/ivy-hydra a33af9b 356/395: Unset yank-undo-function in counsel-yank-pop, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 98c61de 299/395: ivy.el (ivy-set-display-transformer): Mark obsolete, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 177d7e0 325/395: Fix definition of ‘counsel--browse-history’., Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra a877961 330/395: ivy.el (ivy-call): Don't modify default-directory, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 39ede5f 324/395: targets/plain.el: Require ivy-avy, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra d951004 336/395: doc: Conflate installation description, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 3a2c5b2 300/395: counsel.el: Mark obsolete the functions that can be replaced by complete-symbol, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 3ecf828 344/395: ivy.el (ivy-switch-buffer): Don't lose the current index, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 01d9f55 343/395: ivy.el: Fix minibuffer highlighter selction, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra d4fd99f 316/395: Respect original default choice when deduplicating extra actions, Basil L. Contovounesios, 2021/02/25