[elpa] master 5820db3 029/348: ivy.el (ivy--reset-state): Fix last commit

[Oleh Krehel]

branch: master
commit 5820db329b1044ee13717b3d4bdfa56764a5e7ab
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el (ivy--reset-state): Fix last commit
    
    Fixes #515
---
 ivy.el | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/ivy.el b/ivy.el
index 865a936..24d8986 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1446,21 +1446,23 @@ This is useful for recursive `ivy-read'."
                       (file-directory-p initial-input))
                  (progn
                    (setq ivy--directory initial-input)
-                   (setq initial-input nil))
+                   (setq initial-input nil)
+                   (when preselect
+                     (let ((preselect-directory (file-name-directory 
preselect)))
+                       (when (not (equal (expand-file-name preselect-directory)
+                                         (expand-file-name ivy--directory)))
+                         (setf (ivy-state-preselect state) (setq preselect 
nil))))))
                (setq ivy--directory default-directory))
              (require 'dired)
              (when preselect
                (let ((preselect-directory (file-name-directory preselect)))
-                 (if (not (equal (expand-file-name preselect-directory)
-                                 (expand-file-name ivy--directory)))
-                     (setf (ivy-state-preselect state) (setq preselect nil))
-                   (unless (or (null preselect-directory)
-                               (string= preselect-directory
-                                        default-directory))
-                     (setq ivy--directory preselect-directory))
-                   (setf
-                    (ivy-state-preselect state)
-                    (setq preselect (file-name-nondirectory preselect))))))
+                 (unless (or (null preselect-directory)
+                             (string= preselect-directory
+                                      default-directory))
+                   (setq ivy--directory preselect-directory))
+                 (setf
+                  (ivy-state-preselect state)
+                  (setq preselect (file-name-nondirectory preselect)))))
              (setq coll (ivy--sorted-files ivy--directory))
              (when initial-input
                (unless (or require-match