[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master ace01d5 347/348: ivy.el (ivy-immediate-done): Fix for rgre
From: |
Oleh Krehel |
Subject: |
[elpa] master ace01d5 347/348: ivy.el (ivy-immediate-done): Fix for rgrep |
Date: |
Sat, 8 Apr 2017 11:04:28 -0400 (EDT) |
branch: master
commit ace01d5603ddf49b025eb811b612af72ec38dcfb
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy-immediate-done): Fix for rgrep
Fixes #950
---
ivy.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ivy.el b/ivy.el
index 7ef953a..e276b50 100644
--- a/ivy.el
+++ b/ivy.el
@@ -781,7 +781,9 @@ If the text hasn't changed as a result, forward to
`ivy-alt-done'."
(interactive)
(delete-minibuffer-contents)
(insert (setf (ivy-state-current ivy-last)
- (if ivy--directory
+ (if (and ivy--directory
+ (not (eq (ivy-state-history ivy-last)
+ 'grep-files-history)))
(expand-file-name ivy-text ivy--directory)
ivy-text)))
(setq ivy-exit 'done)
- [elpa] master ee0d9e3 275/348: ivy.el (ivy--reset-state): Simplify, (continued)
- [elpa] master ee0d9e3 275/348: ivy.el (ivy--reset-state): Simplify, Oleh Krehel, 2017/04/08
- [elpa] master abdbfa7 273/348: counsel.el: Add counsel-org-agenda-headlines, Oleh Krehel, 2017/04/08
- [elpa] master 482c3e9 279/348: counsel.el (counsel-ace-link): Use `cdr' for action., Oleh Krehel, 2017/04/08
- [elpa] master e4c248a 278/348: doc/ivy.org: Update package names in ELPA/MELPA, Oleh Krehel, 2017/04/08
- [elpa] master 6e6738c 294/348: counsel.el (counsel-git-grep-cmd-default): Use '%s' quoting, Oleh Krehel, 2017/04/08
- [elpa] master d4e5d79 290/348: counsel.el (counsel-package): Fix sorting issue, Oleh Krehel, 2017/04/08
- [elpa] master 15f89f7 295/348: ivy.el (ivy-minibuffer-map): Bind "C-v" and scroll-up-command, Oleh Krehel, 2017/04/08
- [elpa] master ab6561f 321/348: ivy.el: Use set-ivy-index instead of setq ivy--index, Oleh Krehel, 2017/04/08
- [elpa] master 45383fe 330/348: ivy-overlay.el (ivy-display-function-overlay): Put overlay at symbol start, Oleh Krehel, 2017/04/08
- [elpa] master 1d32ceb 332/348: counsel.el (counsel-irony): New command, Oleh Krehel, 2017/04/08
- [elpa] master ace01d5 347/348: ivy.el (ivy-immediate-done): Fix for rgrep,
Oleh Krehel <=
- [elpa] master 2f5bfc0 144/348: counsel.el (counsel-dpkg): New command, Oleh Krehel, 2017/04/08
- [elpa] master d7a1fda 143/348: swiper.el (swiper-all): "M-q" calls query-replace, Oleh Krehel, 2017/04/08
- [elpa] master 5a4ede4 130/348: Fix swiper-all for ivy--regex-ignore-order, Oleh Krehel, 2017/04/08
- [elpa] master 5787780 137/348: Makefile (plain): Print version, Oleh Krehel, 2017/04/08
- [elpa] master 72784c1 149/348: counsel.el (counsel-imenu): Force rescan if requested, Oleh Krehel, 2017/04/08
- [elpa] master 01b0195 306/348: Correct Circe major-modes in ...-font-lock-exclude, Oleh Krehel, 2017/04/08
- [elpa] master 94a466f 341/348: ivy.el: Clean up whitespace, Oleh Krehel, 2017/04/08
- [elpa] master 1220781 131/348: counsel.el (counsel-find-file): Speed up opening remotes, Oleh Krehel, 2017/04/08
- [elpa] master 63dd0d3 134/348: counsel.el (counsel-git-grep-proj-function): Use greedy regex, Oleh Krehel, 2017/04/08
- [elpa] master d41212e 172/348: ivy.el (ivy--insert-minibuffer): Handle empty string, Oleh Krehel, 2017/04/08