[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 59908cd 20/54: Make ivy-current blend correctly for fancy
From: |
Oleh Krehel |
Subject: |
[elpa] master 59908cd 20/54: Make ivy-current blend correctly for fancy minibuffer |
Date: |
Tue, 29 Sep 2015 14:09:53 +0000 |
branch: master
commit 59908cde3443eee44d5e29cba233ee6461fffd1a
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Make ivy-current blend correctly for fancy minibuffer
* ivy.el (ivy--format-minibuffer-line): Stop setting :height - it messes
with blending. Also, the minibuffer height issue was fixed in an
earlier pull request.
(ivy--format): Call `ivy--add-face' on modified string, not on the
original one.
---
ivy.el | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ivy.el b/ivy.el
index cba70b0..c620007 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1531,11 +1531,6 @@ This string will be inserted into the minibuffer.")
nil
str))
(cl-incf i)))))
- (when (fboundp 'add-face-text-property)
- (add-face-text-property
- 0 (length str)
- `(:height ,(face-attribute 'default :height)
- :overline nil) nil str))
str))
(defun ivy--format (cands)
@@ -1559,11 +1554,11 @@ CANDS is a list of strings."
x))
cands)))
(setq ivy--current (copy-sequence (nth index cands)))
- (setf (nth index cands)
- (ivy--add-face ivy--current 'ivy-current-match))
(setq cands (mapcar
#'ivy--format-minibuffer-line
cands))
+ (setf (nth index cands)
+ (ivy--add-face (nth index cands) 'ivy-current-match))
(let* ((ivy--index index)
(res (concat "\n" (funcall ivy-format-function cands))))
(put-text-property 0 (length res) 'read-only nil res)
- [elpa] master dad8183 23/54: Make the minibuffer faces look nicer, (continued)
- [elpa] master dad8183 23/54: Make the minibuffer faces look nicer, Oleh Krehel, 2015/10/07
- [elpa] master 4b17d9a 27/54: Fix up the "foo ! bar" matching and highlighting, Oleh Krehel, 2015/10/07
- [elpa] master d3f1f2c 18/54: Add extra faces for minibuffer highlighting, Oleh Krehel, 2015/10/07
- [elpa] master 1bf45be 21/54: ivy.el (ivy--format-minibuffer-line): Fix nil regexp, Oleh Krehel, 2015/10/07
- [elpa] master e03d968 50/54: ivy.el (ivy--insert-prompt): Avoid negative length error, Oleh Krehel, 2015/10/07
- [elpa] master 7a2070b 45/54: Fix minibuffer collapse in text mode emacs, Oleh Krehel, 2015/10/07
- [elpa] master ba49407 53/54: counsel.el (counsel-ag-function): Improve for fancy faces, Oleh Krehel, 2015/10/07
- [elpa] master 00d8f08 12/54: counsel.el (counsel-org-tag): Now works in agenda, Oleh Krehel, 2015/10/07
- [elpa] master 860e276 13/54: Add swiper-multi command, Oleh Krehel, 2015/10/07
- [elpa] master 5269b79 07/54: When initial input contains a plus, escape it, Oleh Krehel, 2015/10/07
- [elpa] master 59908cd 20/54: Make ivy-current blend correctly for fancy minibuffer,
Oleh Krehel <=
- [elpa] master 5eac62d 26/54: Move swiper-minibuffer-faces to ivy.el, Oleh Krehel, 2015/10/07
- [elpa] master d374afe 31/54: Set truncate-lines in the minibuffer, Oleh Krehel, 2015/10/07
- [elpa] master a57ac0c 28/54: counsel.el (counsel-unicode-char): Add own history, Oleh Krehel, 2015/10/07
- [elpa] master 1319301 35/54: counsel.el (counsel-yank-pop-truncate): Add group, Oleh Krehel, 2015/10/07
- [elpa] master c4d33d3 36/54: ivy.el (ivy-format-function-default): Fix boundp bug, Oleh Krehel, 2015/10/07
- [elpa] master 7410d2d 29/54: ivy.el (ivy-format-function-default): Handle fringe-mode 0, Oleh Krehel, 2015/10/07
- [elpa] master a019441 41/54: Add autoloads to some important functions, Oleh Krehel, 2015/10/07
- [elpa] master ce33972 37/54: counsel.el (counsel-yank-pop): Add autoload, Oleh Krehel, 2015/10/07
- [elpa] master 9679bd7 46/54: swiper.el (swiper--ivy): Remove obsolete version check, Oleh Krehel, 2015/10/07