[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master ee0d9e3 275/348: ivy.el (ivy--reset-state): Simplify
From: |
Oleh Krehel |
Subject: |
[elpa] master ee0d9e3 275/348: ivy.el (ivy--reset-state): Simplify |
Date: |
Sat, 8 Apr 2017 11:04:14 -0400 (EDT) |
branch: master
commit ee0d9e3cdf5ab7ec78625ea2045ed73ad394eac8
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy--reset-state): Simplify
Re #827
---
ivy.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/ivy.el b/ivy.el
index 977de7a..b7cee81 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1545,14 +1545,15 @@ This is useful for recursive `ivy-read'."
(setq ivy-text "")
(setq ivy-calling nil)
(setq ivy-use-ignore ivy-use-ignore-default)
- (setq ivy--highlight-function
- (if (and (eq ivy--regex-function 'swiper--re-builder)
- (assoc t ivy-re-builders-alist)
- (assoc (cdr (assoc t ivy-re-builders-alist))
ivy-highlight-functions-alist))
- (cdr (assoc (cdr (assoc t ivy-re-builders-alist))
ivy-highlight-functions-alist))
- (or (cdr (assoc ivy--regex-function
- ivy-highlight-functions-alist))
- #'ivy--highlight-default)))
+ (let (reb)
+ (setq ivy--highlight-function
+ (if (and (eq ivy--regex-function 'swiper--re-builder)
+ (setq reb (cdr (assoc t ivy-re-builders-alist)))
+ (setq reb (cdr (assoc reb
ivy-highlight-functions-alist))))
+ reb
+ (or (cdr (assoc ivy--regex-function
+ ivy-highlight-functions-alist))
+ #'ivy--highlight-default))))
(let (coll sort-fn)
(cond ((eq collection 'Info-read-node-name-1)
(if (equal Info-current-file "dir")
- [elpa] master 45834cc 231/348: ivy.el (ivy--reset-state): file-name-directory can return nil, (continued)
- [elpa] master 45834cc 231/348: ivy.el (ivy--reset-state): file-name-directory can return nil, Oleh Krehel, 2017/04/08
- [elpa] master aacba19 229/348: ivy.el (ivy--directory-done): Check if ivy-text is a proper dir, Oleh Krehel, 2017/04/08
- [elpa] master b1f587d 233/348: ivy.el (ivy--directory-done): Fix "RET" on no input, Oleh Krehel, 2017/04/08
- [elpa] master 5190412 234/348: Add `counsel-rg`, Oleh Krehel, 2017/04/08
- [elpa] master 92f2be5 247/348: Fix typo in ivy-read docstring, Oleh Krehel, 2017/04/08
- [elpa] master b99f6de 238/348: ivy.el (ivy--directory-done): Fix when ivy-text exists, Oleh Krehel, 2017/04/08
- [elpa] master 0312d5e 259/348: Make counsel-ag support limiting in files., Oleh Krehel, 2017/04/08
- [elpa] master eddf427 261/348: counsel.el (counsel-ag): Fix byte-compile warning, Oleh Krehel, 2017/04/08
- [elpa] master bb4814a 262/348: Fix counsel-ag support limiting in files, Oleh Krehel, 2017/04/08
- [elpa] master 4232088 265/348: Don't claim `swiper' provides `ivy-mode', Oleh Krehel, 2017/04/08
- [elpa] master ee0d9e3 275/348: ivy.el (ivy--reset-state): Simplify,
Oleh Krehel <=
- [elpa] master abdbfa7 273/348: counsel.el: Add counsel-org-agenda-headlines, Oleh Krehel, 2017/04/08
- [elpa] master 482c3e9 279/348: counsel.el (counsel-ace-link): Use `cdr' for action., Oleh Krehel, 2017/04/08
- [elpa] master e4c248a 278/348: doc/ivy.org: Update package names in ELPA/MELPA, Oleh Krehel, 2017/04/08
- [elpa] master 6e6738c 294/348: counsel.el (counsel-git-grep-cmd-default): Use '%s' quoting, Oleh Krehel, 2017/04/08
- [elpa] master d4e5d79 290/348: counsel.el (counsel-package): Fix sorting issue, Oleh Krehel, 2017/04/08
- [elpa] master 15f89f7 295/348: ivy.el (ivy-minibuffer-map): Bind "C-v" and scroll-up-command, Oleh Krehel, 2017/04/08
- [elpa] master ab6561f 321/348: ivy.el: Use set-ivy-index instead of setq ivy--index, Oleh Krehel, 2017/04/08
- [elpa] master 45383fe 330/348: ivy-overlay.el (ivy-display-function-overlay): Put overlay at symbol start, Oleh Krehel, 2017/04/08
- [elpa] master 1d32ceb 332/348: counsel.el (counsel-irony): New command, Oleh Krehel, 2017/04/08
- [elpa] master ace01d5 347/348: ivy.el (ivy-immediate-done): Fix for rgrep, Oleh Krehel, 2017/04/08