[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master fe6d2b1 07/63: Make ffap work again
|
From: |
Oleh Krehel |
|
Subject: |
[elpa] master fe6d2b1 07/63: Make ffap work again |
|
Date: |
Fri, 21 Aug 2015 12:08:30 +0000 |
branch: master
commit fe6d2b17326625160a89d71ec6b2244270b66baa
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Make ffap work again
* ivy.el (ivy--reset-state): When completing files, consider the case
when the directory of PRESELECT isn't `default-directory'.
Fixes #165
---
ivy.el | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ivy.el b/ivy.el
index 4bb6278..dfed9f4 100644
--- a/ivy.el
+++ b/ivy.el
@@ -870,6 +870,13 @@ This is useful for recursive `ivy-read'."
((eq collection 'read-file-name-internal)
(setq ivy--directory default-directory)
(require 'dired)
+ (when preselect
+ (let ((preselect-directory (file-name-directory preselect)))
+ (unless (string= preselect-directory
+ default-directory)
+ (setq coll (ivy--sorted-files
+ (setq ivy--directory preselect-directory)))
+ (setq preselect (file-name-nondirectory preselect)))))
(setq coll
(ivy--sorted-files default-directory))
(when initial-input
- [elpa] master updated (b0039dd -> f5dac47), Oleh Krehel, 2015/08/21
- [elpa] master bb953c6 01/63: ivy.el (ivy-restrict-to-matches): Add and bind to "S-SPC", Oleh Krehel, 2015/08/21
- [elpa] master d6452fb 02/63: Add a custom keymap for ivy-switch-buffer, Oleh Krehel, 2015/08/21
- [elpa] master 1aa7520 03/63: Add a custom keymap for counsel-find-file, Oleh Krehel, 2015/08/21
- [elpa] master 9bbf9f9 04/63: Fixup the last two commits, Oleh Krehel, 2015/08/21
- [elpa] master b465c09 06/63: ivy.el (ivy-switch-buffer): Add a multi-action interface, Oleh Krehel, 2015/08/21
- [elpa] master 082fbbc 05/63: Add a multi-action interface for counsel-locate, Oleh Krehel, 2015/08/21
- [elpa] master 548a766 08/63: ivy.el (ivy--reset-state): Fixup, Oleh Krehel, 2015/08/21
- [elpa] master fe6d2b1 07/63: Make ffap work again,
Oleh Krehel <=
- [elpa] master f6f3963 09/63: Bind case-fold-search to t when the input is all lower-case, Oleh Krehel, 2015/08/21
- [elpa] master d5af987 11/63: ivy.el (ivy--reset-state): Fixup, Oleh Krehel, 2015/08/21
- [elpa] master d1f88fa 10/63: ivy.el (ivy-read): Don't put empty string on history, Oleh Krehel, 2015/08/21
- [elpa] master f9974e8 12/63: Allow to see the candidate index via ivy-count-format, Oleh Krehel, 2015/08/21
- [elpa] master 783f7c5 13/63: Update index formatting logic, Oleh Krehel, 2015/08/21
- [elpa] master 3164753 14/63: counsel.el (counsel-locate-history): Add, Oleh Krehel, 2015/08/21
- [elpa] master 19dcc0f 16/63: ivy.el (ivy--regex): Improve for trailing backslash, Oleh Krehel, 2015/08/21
- [elpa] master ea6525e 18/63: ivy.el (ivy-read): Improve ivy-set-actions interaction, Oleh Krehel, 2015/08/21
- [elpa] master e9c2538 19/63: counsel.el (counsel-rhythmbox-history): Add, Oleh Krehel, 2015/08/21
- [elpa] master 21007c2 17/63: Add counsel-rhythmbox, Oleh Krehel, 2015/08/21