[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 94c124d 07/12: ivy.el (ivy-done): Don't directory-expand g
From: |
Oleh Krehel |
Subject: |
[elpa] master 94c124d 07/12: ivy.el (ivy-done): Don't directory-expand glob filename |
Date: |
Tue, 21 Apr 2015 12:09:21 +0000 |
branch: master
commit 94c124dfb4e67838867e0cb598ebb83ee08a89f6
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy-done): Don't directory-expand glob filename
* ivy.el (ivy-done): Don't directory-expand if there's a star in the
file name.
This change fixes the behavior of `rgrep`. It can't handle the case of
e.g. /foo/bar/\*.el, but handles \*.el fine.
Re #45
---
ivy.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ivy.el b/ivy.el
index 65b68d9..1353bf0 100644
--- a/ivy.el
+++ b/ivy.el
@@ -170,7 +170,9 @@ When non-nil, it should contain one %d.")
(cond ((string= ivy-text "")
(if (equal ivy--current "./")
ivy--directory
- (expand-file-name ivy--current ivy--directory)))
+ (if (string-match "\\*" ivy--current)
+ ivy--current
+ (expand-file-name ivy--current ivy--directory))))
((zerop ivy--length)
(expand-file-name ivy-text ivy--directory))
(t
- [elpa] master updated (3d54459 -> e86b27e), Oleh Krehel, 2015/04/21
- [elpa] master 0d1fa17 01/12: ivy.el (ivy-done): Expand file name for empty text, Oleh Krehel, 2015/04/21
- [elpa] master 36b15f3 02/12: ivy.el (ivy--regex): Switch to non-greedy ".*?" joiner, Oleh Krehel, 2015/04/21
- [elpa] master 49638b4 04/12: ivy.el (ivy--sorted-files): Avoid returning an empty list, Oleh Krehel, 2015/04/21
- [elpa] master 2a5d3fc 05/12: Fix double-sorting for file names, Oleh Krehel, 2015/04/21
- [elpa] master bb89c9d 03/12: Allow to customize the sorting methods, Oleh Krehel, 2015/04/21
- [elpa] master 94c124d 07/12: ivy.el (ivy-done): Don't directory-expand glob filename,
Oleh Krehel <=
- [elpa] master 5268d10 06/12: Add an option to call the completion action without exiting, Oleh Krehel, 2015/04/21
- [elpa] master 9d5b60f 09/12: ivy.el (ivy--regex): Add optional greedy arg, Oleh Krehel, 2015/04/21
- [elpa] master be716a1 08/12: swiper.el (swiper--add-overlays): Update arglist, Oleh Krehel, 2015/04/21
- [elpa] master b724678 10/12: counsel.el: Add awesome swiper highlighting to git grep, Oleh Krehel, 2015/04/21
- [elpa] master 675bd5f 11/12: Fix describe-function / -variable "C-." interaction, Oleh Krehel, 2015/04/21
- [elpa] master e86b27e 12/12: Merge commit '675bd5ff97f75fb7d838e6056442ce71adf85e56' from swiper, Oleh Krehel, 2015/04/21