[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master cf3ac8f 04/12: ivy.el (ivy-done): Update wrt globs
From: |
Oleh Krehel |
Subject: |
[elpa] master cf3ac8f 04/12: ivy.el (ivy-done): Update wrt globs |
Date: |
Thu, 23 Apr 2015 18:01:56 +0000 |
branch: master
commit cf3ac8f0e401d573ba17027eee00627dfeda8537
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy-done): Update wrt globs
Re #55
---
ivy.el | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ivy.el b/ivy.el
index 89c6e51..9019296 100644
--- a/ivy.el
+++ b/ivy.el
@@ -171,12 +171,12 @@ When non-nil, it should contain one %d.")
(delete-minibuffer-contents)
(when (cond (ivy--directory
(insert
- (cond ((string= ivy-text "")
+ (cond ((string-match "\\*" ivy--current)
+ ivy--current)
+ ((string= ivy-text "")
(if (equal ivy--current "./")
ivy--directory
- (if (string-match "\\*" ivy--current)
- ivy--current
- (expand-file-name ivy--current ivy--directory))))
+ (expand-file-name ivy--current ivy--directory)))
((zerop ivy--length)
(if (string-match "\\*" ivy-text)
ivy-text
@@ -678,6 +678,8 @@ When GREEDY is non-nil, join words in a greedy way."
;; get out of the prompt area
(constrain-to-field nil (point-max)))))
+(defvar inhibit-message)
+
(defun ivy--exhibit ()
"Insert Ivy completions display.
Should be run via minibuffer `post-command-hook'."
- [elpa] master updated (f9b63e4 -> c10ba4b), Oleh Krehel, 2015/04/23
- [elpa] master 444f57e 01/12: ivy.el (ivy-done): Don't expand globs, Oleh Krehel, 2015/04/23
- [elpa] master 013fe04 02/12: swiper.el (swiper--ivy): Check for stand-alone ivy, Oleh Krehel, 2015/04/23
- [elpa] master 7032df7 06/12: counsel.el (counsel-git-grep): Fixup, Oleh Krehel, 2015/04/23
- [elpa] master c3e38fb 07/12: Remove globbing heuristics for file name completion, Oleh Krehel, 2015/04/23
- [elpa] master 886d908 08/12: Exclude jabber-chat-mode from font-lock, Oleh Krehel, 2015/04/23
- [elpa] master 9470e76 09/12: Avoid sorting org refile candidates, Oleh Krehel, 2015/04/23
- [elpa] master cf3ac8f 04/12: ivy.el (ivy-done): Update wrt globs,
Oleh Krehel <=
- [elpa] master 725e12a 11/12: ivy.el (Info-current-file): Declare, Oleh Krehel, 2015/04/23
- [elpa] master 37b7d39 03/12: swiper.el (swiper-query-replace): Fix, Oleh Krehel, 2015/04/23
- [elpa] master a70b734 05/12: ivy.el (ivy-backward-delete-char): Expand `ivy--directory', Oleh Krehel, 2015/04/23
- [elpa] master c10ba4b 12/12: Merge commit '725e12a51e837ed75361f9f2258a887cacb120cd' from swiper, Oleh Krehel, 2015/04/23
- [elpa] master 9b315e8 10/12: Use "//" to move to root instead of "/" as before, Oleh Krehel, 2015/04/23