Merge ivy-def into ivy-last

* ivy.el (ivy-def): Remove defvar.
(ivy-read): Update.
(ivy--filter): Update.

diff --git a/ivy.el b/ivy.el
index 307c98993fe1026f2fa2162fb191106c5bc8f171..10b25f5ebef0aa454e78ce96e65d0262c3e9217f 100644 (file)
--- 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)))