[elpa] master 03ab827 07/57: Merge ivy--collection into ivy-last

[Oleh Krehel]

branch: master
commit 03ab8272b49b5c8b6e0a7454bd31f7acb6fa4d83
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    Merge ivy--collection into ivy-last
    
    * ivy.el (ivy--collection): Delete defvar.
    (ivy-read): Update.
    (ivy--exhibit): Update.
---
 ivy.el |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/ivy.el b/ivy.el
index dae8e70..795aa9d 100644
--- a/ivy.el
+++ b/ivy.el
@@ -183,9 +183,6 @@ When non-nil, it should contain one %d.")
 (defvar ivy--regex-function 'ivy--regex
   "Current function for building a regex.")
 
-(defvar ivy--collection nil
-  "Store the current collection function.")
-
 (defvar Info-current-file)
 
 ;;* Commands
@@ -565,8 +562,6 @@ UNWIND is a lambda to call before exiting."
             'ivy--regex))
   (setq ivy--subexps 0)
   (setq ivy--regexp-quote 'regexp-quote)
-  (setq ivy--collection (and (functionp collection)
-                             collection))
   (setq ivy--old-text "")
   (setq ivy-text "")
   (let (coll sort-fn)
@@ -919,7 +914,7 @@ Should be run via minibuffer `post-command-hook'."
                    (ivy--cd "/")))
              (if (string-match "~$" ivy-text)
                  (ivy--cd (expand-file-name "~/")))))
-          ((eq ivy--collection 'internal-complete-buffer)
+          ((eq (ivy-state-collection ivy-last) 'internal-complete-buffer)
            (when (or (and (string-match "^ " ivy-text)
                           (not (string-match "^ " ivy--old-text)))
                      (and (string-match "^ " ivy--old-text)