[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 9b9885d 33/57: ivy.el (ivy-partial-or-done): Fixup
From: |
Oleh Krehel |
Subject: |
[elpa] master 9b9885d 33/57: ivy.el (ivy-partial-or-done): Fixup |
Date: |
Tue, 19 May 2015 14:21:33 +0000 |
branch: master
commit 9b9885da6eb3d260d36c1792313cb0dd053e995d
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy-partial-or-done): Fixup
* ivy.el (ivy-partial-or-done): Switch `default-directory' so that
`minibuffer-complete' is aware of it. Select a directory only if there
is only one.
---
ivy.el | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ivy.el b/ivy.el
index 551ed01..feed8c3 100644
--- a/ivy.el
+++ b/ivy.el
@@ -294,10 +294,11 @@ When called twice in a row, exit the minibuffer with the
current
candidate."
(interactive)
(if (eq (ivy-state-collection ivy-last) 'read-file-name-internal)
- (progn
+ (let ((default-directory ivy--directory))
(minibuffer-complete)
(setq ivy-text (ivy--input))
- (when (file-directory-p ivy-text)
+ (when (and (file-directory-p ivy-text)
+ (= ivy--length 1))
(ivy--cd (expand-file-name ivy-text))))
(or (ivy-partial)
(if (eq this-command last-command)
- [elpa] master 5601653 06/57: Require dired when completing file names, (continued)
- [elpa] master 5601653 06/57: Require dired when completing file names, Oleh Krehel, 2015/05/19
- [elpa] master 4a7ba2f 15/57: Try to prevent the resize of minibuffer window, Oleh Krehel, 2015/05/19
- [elpa] master 5a451a9 26/57: ivy.el (ivy-read): Add a re-builder argument, Oleh Krehel, 2015/05/19
- [elpa] master f7fc3ad 11/57: Work around grep-read-files, Oleh Krehel, 2015/05/19
- [elpa] master 056614d 22/57: Rename avy-swiper to swiper-avy, Oleh Krehel, 2015/05/19
- [elpa] master cf292da 23/57: Declare swiper-map, Oleh Krehel, 2015/05/19
- [elpa] master a953af0 19/57: Simplify ivy-partial-or-done, Oleh Krehel, 2015/05/19
- [elpa] master fe34d2c 10/57: ivy.el (ivy-partial-or-done): Handle empty input, Oleh Krehel, 2015/05/19
- [elpa] master 77abf00 25/57: ivy.el (ivy-backward-kill-word): Add and bind to "M-DEL", Oleh Krehel, 2015/05/19
- [elpa] master 8c936bc 21/57: ivy.el (ivy-use-virtual-buffers): New defcustom, Oleh Krehel, 2015/05/19
- [elpa] master 9b9885d 33/57: ivy.el (ivy-partial-or-done): Fixup,
Oleh Krehel <=
- [elpa] master d841418 24/57: Fix the transition from a bad regex to good one, Oleh Krehel, 2015/05/19
- [elpa] master 2ad5fb1 20/57: Add support for virtual buffers, Oleh Krehel, 2015/05/19
- [elpa] master f97622d 30/57: swiper.el (swiper-font-lock-ensure): Ignore fundamental-mode, Oleh Krehel, 2015/05/19
- [elpa] master 6d4f2b3 34/57: Fix the error switching to non-existent buffers, Oleh Krehel, 2015/05/19
- [elpa] master 16eb4a2 31/57: When completing file names, defer to `minibuffer-complete' for "TAB", Oleh Krehel, 2015/05/19
- [elpa] master b63c358 35/57: Properly update virtual buffers for "^ " interaction, Oleh Krehel, 2015/05/19
- [elpa] master d8f79fa 43/57: ivy.el (ivy-partial-or-done): Update doc, Oleh Krehel, 2015/05/19
- [elpa] master ce0efb3 29/57: Allow to customize the minibuffer formatter, Oleh Krehel, 2015/05/19
- [elpa] master 9a2083a 27/57: Swiper should use the :re-builder argument, Oleh Krehel, 2015/05/19
- [elpa] master d8c2ef3 45/57: ivy.el (ivy-partial-or-done): More predictability, Oleh Krehel, 2015/05/19