[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 5820db3 029/348: ivy.el (ivy--reset-state): Fix last commi
From: |
Oleh Krehel |
Subject: |
[elpa] master 5820db3 029/348: ivy.el (ivy--reset-state): Fix last commit |
Date: |
Sat, 8 Apr 2017 11:03:17 -0400 (EDT) |
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
- [elpa] master 94e22bf 096/348: counsel.el (counsel-describe-face): New command, (continued)
- [elpa] master 94e22bf 096/348: counsel.el (counsel-describe-face): New command, Oleh Krehel, 2017/04/08
- [elpa] master a627164 092/348: Mention that ivy-format-function is the variable described, Oleh Krehel, 2017/04/08
- [elpa] master 0d77775 103/348: README.md: Add a FAQ section, Oleh Krehel, 2017/04/08
- [elpa] master 17b59b2 105/348: Documenting how to generate texinfo, Oleh Krehel, 2017/04/08
- [elpa] master ed61b04 016/348: Fix problems introduced by "(ivy--filter): Recompute index after sort", Oleh Krehel, 2017/04/08
- [elpa] master d3c8028 023/348: ivy.el (ivy--sorted-files): Add a safety work-around, Oleh Krehel, 2017/04/08
- [elpa] master 4a2f0d4 026/348: Remove needless code, Oleh Krehel, 2017/04/08
- [elpa] master 12145d7 030/348: ivy.el (ivy-completion-in-region-action): Remove string props, Oleh Krehel, 2017/04/08
- [elpa] master 899c2aa 017/348: doc/ivy.org: Mention "/sudo:", Oleh Krehel, 2017/04/08
- [elpa] master c24a372 006/348: doc/Changelog.org: Fix some CUSTOM_ID, Oleh Krehel, 2017/04/08
- [elpa] master 5820db3 029/348: ivy.el (ivy--reset-state): Fix last commit,
Oleh Krehel <=
- [elpa] master bc9e17a 033/348: ivy.el (ivy--reset-state): Prevent (expand-file-name nil), Oleh Krehel, 2017/04/08
- [elpa] master 12e35d0 037/348: counsel.el (counsel-bookmark): Add with-ivy-window, Oleh Krehel, 2017/04/08
- [elpa] master 85dc501 005/348: doc/Changelog.org: Add CUSTOM_ID to releases 0.6.0 and 0.7.0, Oleh Krehel, 2017/04/08
- [elpa] master 5826c86 035/348: ivy.el (ivy--reset-state): Add workaround for dired-do-copy, Oleh Krehel, 2017/04/08
- [elpa] master f57e2fb 039/348: ivy.el (ivy-immediate-done): Update docstring, Oleh Krehel, 2017/04/08
- [elpa] master 4f57a3a 041/348: Add forth-block-mode, Oleh Krehel, 2017/04/08
- [elpa] master db94a12 043/348: ivy.el (ivy-completion-in-region): Fix double insert bug, Oleh Krehel, 2017/04/08
- [elpa] master de91a77 042/348: swiper.el (swiper-occur): Add require, Oleh Krehel, 2017/04/08
- [elpa] master fabcdc0 004/348: doc/Changelog.org: Add custom ids and whitespace in the end, Oleh Krehel, 2017/04/08
- [elpa] master c30a6e2 046/348: ivy.el (ivy-minibuffer-map): Undo remap, Oleh Krehel, 2017/04/08