Merge commit '2fd99e13ca15b6356c149deb74d6a2e78d0b264a' from swiper

diff --git a/packages/swiper/ivy.el b/packages/swiper/ivy.el
index 38a8ff4724bd3bc5dca60a0cce3c72e2963c2193..f4e368e2931a666aa5f7d9b8dbc6229f37d196c5 100644 (file)
--- a/packages/swiper/ivy.el
+++ b/packages/swiper/ivy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.2.1
+;; Version: 0.2.2
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: matching
 
@@ -233,7 +233,7 @@ UPDATE-FN is called each time the current candidate(s) is changed."
 
 (defun ivy-completing-read (prompt collection
                             &optional predicate _require-match initial-input
-                            &rest _ignore)
+                              _history def _inherit-input-method)
   "Read a string in the minibuffer, with completion.
 
 This is an interface that conforms to `completing-read', so that
@@ -245,17 +245,23 @@ PREDICATE limits completion to a subset of COLLECTION.
 
 _REQUIRE-MATCH is ignored for now.
 INITIAL-INPUT is a string that can be inserted into the minibuffer initially.
+_HISTORY is ignored for now.
+DEF is the default value.
+_INHERIT-INPUT-METHOD is ignored for now.
 
 The history, defaults and input-method arguments are ignored for now."
   (cond ((functionp collection)
-         (error "Function as a collection unsupported"))
+         (setq collection (all-completions "" collection))
+         (setq initial-input nil))
         ((hash-table-p collection)
          (error "Hash table as a collection unsupported"))
         ((listp (car collection))
          (setq collection (mapcar #'car collection))))
   (when predicate
     (setq collection (cl-remove-if-not predicate collection)))
-  (ivy-read prompt collection initial-input))
+  (when (listp def)
+    (setq def (car def)))
+  (ivy-read prompt collection initial-input nil def))
 
 ;;;###autoload
 (define-minor-mode ivy-mode

diff --git a/packages/swiper/swiper.el b/packages/swiper/swiper.el
index a3143f750295c94d6624ef8b5eee331147f6c621..8f0a083c4fb709f9fa90586657afc7a17b2da781 100644 (file)
--- a/packages/swiper/swiper.el
+++ b/packages/swiper/swiper.el
@@ -113,9 +113,10 @@
                                  gnus-group-mode
                                  emms-playlist-mode erc-mode
                                  org-agenda-mode)))
-    (if (fboundp 'font-lock-ensure)
-        (font-lock-ensure)
-      (font-lock-fontify-buffer))))
+    (unless (> (buffer-size) 100000)
+      (if (fboundp 'font-lock-ensure)
+          (font-lock-ensure)
+        (font-lock-fontify-buffer)))))
 
 (defvar swiper--format-spec ""
   "Store the current candidates format spec.")
@@ -163,7 +164,6 @@ When non-nil, INITIAL-INPUT is the initial search pattern."
   "`isearch' with an overview using `ivy'.
 When non-nil, INITIAL-INPUT is the initial search pattern."
   (interactive)
-  (ido-mode -1)
   (swiper--init)
   (let ((candidates (swiper--candidates))
         (preselect (format
@@ -183,7 +183,6 @@ When non-nil, INITIAL-INPUT is the initial search pattern."
                     swiper-map
                     preselect
                     #'swiper--update-input-ivy))
-      (ido-mode 1)
       (swiper--cleanup)
       (if (null ivy-exit)
           (goto-char swiper--opoint)