[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master b5a9dc5 255/272: ivy.el (ivy--reset-state): file-directory
From: |
Oleh Krehel |
Subject: |
[elpa] master b5a9dc5 255/272: ivy.el (ivy--reset-state): file-directory-p needs a string |
Date: |
Mon, 25 Apr 2016 10:13:29 +0000 |
branch: master
commit b5a9dc5c0776259113ecccacb7410262266dc971
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el (ivy--reset-state): file-directory-p needs a string
---
ivy.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ivy.el b/ivy.el
index 22deab9..1a9ba33 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1400,11 +1400,11 @@ This is useful for recursive `ivy-read'."
:test #'equal)))
(setq coll (all-completions "" collection predicate))))
((eq collection 'read-file-name-internal)
- (setq ivy--directory
- (if (file-directory-p initial-input)
- (prog1 initial-input
- (setq initial-input nil))
- default-directory))
+ (if (and initial-input (file-directory-p initial-input))
+ (progn
+ (setq ivy--directory initial-input)
+ (setq initial-input nil))
+ (setq ivy--directory default-directory))
(require 'dired)
(when preselect
(let ((preselect-directory (file-name-directory preselect)))
- [elpa] master e224847 179/272: ivy.el (ivy--reset-state): Fix prompt / require-match issue, (continued)
- [elpa] master e224847 179/272: ivy.el (ivy--reset-state): Fix prompt / require-match issue, Oleh Krehel, 2016/04/25
- [elpa] master 5229ebe 173/272: counsel.el (counsel-prompt-function-dir): Fix format, Oleh Krehel, 2016/04/25
- [elpa] master 8de2930 221/272: ivy.el: Improve "M-n", Oleh Krehel, 2016/04/25
- [elpa] master 6823518 196/272: swiper.el (swiper--candidates): Always remove '(field), Oleh Krehel, 2016/04/25
- [elpa] master d45ee54 258/272: Make the slash more magic during file name completion, Oleh Krehel, 2016/04/25
- [elpa] master ea79f0e 135/272: New API function ivy-set-display-transformer, Oleh Krehel, 2016/04/25
- [elpa] master b2d2b82 209/272: counsel.el (counsel-grep-action): Improve cleanup, Oleh Krehel, 2016/04/25
- [elpa] master 8c4f595 233/272: Fix remapping commit c9b6e0, Oleh Krehel, 2016/04/25
- [elpa] master 6fae6e0 259/272: counsel.el (counsel-grep-or-swiper): Use swiper when narrowed, Oleh Krehel, 2016/04/25
- [elpa] master 1b4e819 218/272: ivy.el (ivy-next-history-element): Simplify, Oleh Krehel, 2016/04/25
- [elpa] master b5a9dc5 255/272: ivy.el (ivy--reset-state): file-directory-p needs a string,
Oleh Krehel <=
- [elpa] master 6fc36b5 210/272: option to add newline after ivy-read prompt, Oleh Krehel, 2016/04/25
- [elpa] master 9899547 235/272: ivy.el (ivy-action): New face, Oleh Krehel, 2016/04/25
- [elpa] master 63b96a1 250/272: Fix counsel-grep-last-line bug, Oleh Krehel, 2016/04/25
- [elpa] master a891df3 264/272: swiper.el (swiper--multi-candidates): Add check, Oleh Krehel, 2016/04/25
- [elpa] master 5ce2623 223/272: counsel.el (counsel-git): Add "j" action, Oleh Krehel, 2016/04/25
- [elpa] master ee27e27 161/272: ivy.el (ivy-occur-revert-buffer): Move code to swiper-occur, Oleh Krehel, 2016/04/25
- [elpa] master 3dcb07d 237/272: Allow to customize the action hint formatter, Oleh Krehel, 2016/04/25
- [elpa] master 39a458e 272/272: Merge commit 'db005182ad0fd05c07e8e5c085abe6c750e6c578' from ivy, Oleh Krehel, 2016/04/25