[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 1332b19 22/31: ivy.el (ivy--exhibit): Fixup last commit
From: |
Oleh Krehel |
Subject: |
[elpa] master 1332b19 22/31: ivy.el (ivy--exhibit): Fixup last commit |
Date: |
Fri, 01 May 2015 14:29:00 +0000 |
branch: master
commit 1332b1991aee6bc1e3acf53c78d416264f7782f9
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy--exhibit): Fixup last commit
* ivy.el (ivy--old-text): Should always be a string.
(ivy-read): Update.
(ivy--exhibit): Recompute candidates on flip, always set `ivy--old-re'
to nil.
---
ivy.el | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/ivy.el b/ivy.el
index 37c9c94..2030222 100644
--- a/ivy.el
+++ b/ivy.el
@@ -509,7 +509,7 @@ When SORT is t, refer to `ivy-sort-functions-alist' for
sorting."
(setq ivy--regexp-quote 'regexp-quote)
(setq ivy--collection (and (functionp collection)
collection))
- (setq ivy--old-text nil)
+ (setq ivy--old-text "")
(let (coll sort-fn)
(cond ((eq collection 'Info-read-node-name-1)
(if (equal Info-current-file "dir")
@@ -744,7 +744,7 @@ Everything after \"!\" should not match."
(defvar ivy--full-length nil
"When `ivy--dynamic-function' is non-nil, this can be the total amount of
candidates.")
-(defvar ivy--old-text nil
+(defvar ivy--old-text ""
"Store old `ivy-text' for dynamic completion.")
(defun ivy--insert-prompt ()
@@ -819,21 +819,20 @@ Should be run via minibuffer `post-command-hook'."
(ivy--cd "/")))
(if (string-match "~$" ivy-text)
(ivy--cd (expand-file-name "~/")))))
- ((and (eq ivy--collection 'internal-complete-buffer)
- (or (= (length ivy--old-text) 0)
- (condition-case nil
- (/= (aref ivy-text 0)
- (aref ivy--old-text 0))
- (error t))))
- (setq ivy--all-candidates
- (all-completions
- (if (and (> (length ivy-text) 0)
- (eq (aref ivy-text 0)
- ?\ ))
- " "
- "")
- 'internal-complete-buffer))
- (setq ivy--old-re " ")))
+ ((eq ivy--collection 'internal-complete-buffer)
+ (when (or (and (string-match "^ " ivy-text)
+ (not (string-match "^ " ivy--old-text)))
+ (and (string-match "^ " ivy--old-text)
+ (not (string-match "^ " ivy-text))))
+ (setq ivy--all-candidates
+ (all-completions
+ (if (and (> (length ivy-text) 0)
+ (eq (aref ivy-text 0)
+ ?\ ))
+ " "
+ "")
+ 'internal-complete-buffer))
+ (setq ivy--old-re nil))))
(ivy--insert-minibuffer
(ivy--format
(ivy--filter ivy-text ivy--all-candidates))))
- [elpa] master 7f04019 12/31: swiper.el (swiper-font-lock-ensure): Exclude `elfeed-search-mode', (continued)
- [elpa] master 7f04019 12/31: swiper.el (swiper-font-lock-ensure): Exclude `elfeed-search-mode', Oleh Krehel, 2015/05/01
- [elpa] master 278870e 13/31: Use alpha compositing to add ivy-current-match face, Oleh Krehel, 2015/05/01
- [elpa] master 57de44c 14/31: Makefile: Update, Oleh Krehel, 2015/05/01
- [elpa] master 56d7802 15/31: Add an option for multi-tier regex matching, Oleh Krehel, 2015/05/01
- [elpa] master 7299950 16/31: ivy.el: Fixup docstrings, Oleh Krehel, 2015/05/01
- [elpa] master aa9d4a7 17/31: ivy.el (ivy-re-builders-alist): Improve doc, Oleh Krehel, 2015/05/01
- [elpa] master 0f141f5 18/31: counsel.el (counsel-git-grep): Add optional initial-input, Oleh Krehel, 2015/05/01
- [elpa] master 23ffa25 19/31: Bind "TAB" to do partial completion, Oleh Krehel, 2015/05/01
- [elpa] master ae2fd1a 21/31: Improve hidden buffer completion further, Oleh Krehel, 2015/05/01
- [elpa] master 5dc26fb 20/31: Improve the completion of hidden buffers, Oleh Krehel, 2015/05/01
- [elpa] master 1332b19 22/31: ivy.el (ivy--exhibit): Fixup last commit,
Oleh Krehel <=
- [elpa] master 6b2e95a 24/31: Add gamma-correction to alpha-blending, Oleh Krehel, 2015/05/01
- [elpa] master a868705 23/31: colir.el: Add two additional blend algorithms, Oleh Krehel, 2015/05/01
- [elpa] master 7bd6003 25/31: Update and improve faces, Oleh Krehel, 2015/05/01
- [elpa] master 94b6a83 26/31: Don't error on bad regex, Oleh Krehel, 2015/05/01
- [elpa] master 0dd6c5a 27/31: ivy.el (ivy--regex): Fixup, Oleh Krehel, 2015/05/01
- [elpa] master fc84e0d 28/31: ivy.el (ivy-read): Reset `ivy-text' earlier, Oleh Krehel, 2015/05/01
- [elpa] master 5a1bd78 29/31: Improve TRAMP completion for ivy-mode, Oleh Krehel, 2015/05/01
- [elpa] master 5a2e0fd 30/31: Allow for "/ssh:user@" as well as for "/ssh:", Oleh Krehel, 2015/05/01
- [elpa] master 4137447 31/31: Merge commit '5a2e0fd355fea83e3c172402b965a1aa826fcc0c' from swiper, Oleh Krehel, 2015/05/01