[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0210bb6 03/12: Merge ivy-def into ivy-last
From: |
Oleh Krehel |
Subject: |
[elpa] master 0210bb6 03/12: Merge ivy-def into ivy-last |
Date: |
Sun, 03 May 2015 11:04:51 +0000 |
branch: master
commit 0210bb6c06b1fa734e02f9179c3e579360a3d00a
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Merge ivy-def into ivy-last
* ivy.el (ivy-def): Remove defvar.
(ivy-read): Update.
(ivy--filter): Update.
---
ivy.el | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ivy.el b/ivy.el
index 307c989..10b25f5 100644
--- a/ivy.el
+++ b/ivy.el
@@ -132,9 +132,6 @@ Only \"./\" and \"../\" apply here. They appear in reverse
order."
Maximum length of the history list is determined by the value
of `history-length', which see.")
-(defvar ivy-def nil
- "Store the default completion value. See `completing-read'.")
-
(defvar ivy--directory nil
"Current directory when completing file names.")
@@ -552,7 +549,6 @@ When SORT is t, refer to `ivy-sort-functions-alist' for
sorting."
:update-fn update-fn
:sort sort))
(setq ivy--directory nil)
- (setq ivy-def preselect)
(setq ivy-window (selected-window))
(setq ivy--regex-function
(or (and (functionp collection)
@@ -988,7 +984,8 @@ CANDIDATES are assumed to be static."
(setq ivy--index (or idx 0))))
(when (and (string= name "") (not (equal ivy--old-re "")))
(setq ivy--index
- (or (cl-position ivy-def cands :test 'equal)
+ (or (cl-position (ivy-state-preselect ivy-last)
+ cands :test 'equal)
ivy--index)))
(setq ivy--old-re re)
(setq ivy--old-cands cands)))
- [elpa] master updated (69bf1bd -> 34753b4), Oleh Krehel, 2015/05/03
- [elpa] master 0353b9f 01/12: Add ivy-state struct, Oleh Krehel, 2015/05/03
- [elpa] master 0210bb6 03/12: Merge ivy-def into ivy-last,
Oleh Krehel <=
- [elpa] master d0b6e94 02/12: Allow to quote spaces while matching, Oleh Krehel, 2015/05/03
- [elpa] master 7f63f09 04/12: Merge ivy-window into ivy-last, Oleh Krehel, 2015/05/03
- [elpa] master 00d1c95 06/12: ivy-resume now works for functions that supply action, Oleh Krehel, 2015/05/03
- [elpa] master cdafe1b 05/12: Merge ivy--action into ivy-last, Oleh Krehel, 2015/05/03
- [elpa] master 2bc08de 07/12: Merge ivy--persistent-action into ivy-state-action, Oleh Krehel, 2015/05/03
- [elpa] master 2e046d1 09/12: Fix the candidate index for `ivy-resume', Oleh Krehel, 2015/05/03
- [elpa] master 109fb7d 08/12: Add unwind argument to ivy-read, Oleh Krehel, 2015/05/03
- [elpa] master b5332c5 10/12: ivy.el (ivy-resume): Quote the preselect, Oleh Krehel, 2015/05/03
- [elpa] master 829bdb6 11/12: swiper.el: Bump version, Oleh Krehel, 2015/05/03
- [elpa] master 34753b4 12/12: Merge commit '829bdb6dcb08e2b1a8d8c329e697156e5fa2dbcc' from swiper, Oleh Krehel, 2015/05/03