[elpa] master bc9e17a 033/348: ivy.el (ivy--reset-state): Prevent (expand-file-name nil)

[Oleh Krehel]

branch: master
commit bc9e17abad8bb54d0ebc41282485b9197c012a24
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>

    ivy.el (ivy--reset-state): Prevent (expand-file-name nil)
    
    Fixes #518
---
 ivy.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ivy.el b/ivy.el
index 67f530e..0931ada 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1459,8 +1459,9 @@ This is useful for recursive `ivy-read'."
                    (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)))
+                       (when (and preselect-directory
+                                  (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)