emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 935603e 310/399: ivy.el (ivy--done): Press "RET" or "C-m"


From: Oleh Krehel
Subject: [elpa] master 935603e 310/399: ivy.el (ivy--done): Press "RET" or "C-m" to create a directory
Date: Sat, 20 Jul 2019 14:57:46 -0400 (EDT)

branch: master
commit 935603e8c5ea17d543840dce962824a90e3b5c70
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    ivy.el (ivy--done): Press "RET" or "C-m" to create a directory
    
    Currently, `dired-create-directory' and `make-directory' are detected
    via their prompt string. Not the best, but likely works 99% of the
    time as is less frustrating for new users.
---
 ivy.el | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ivy.el b/ivy.el
index e9aaf14..3c9da58 100644
--- a/ivy.el
+++ b/ivy.el
@@ -685,14 +685,16 @@ N is obtained from `ivy-more-chars-alist'."
 
 (defun ivy--done (text)
   "Insert TEXT and exit minibuffer."
-  (insert
-   (setf (ivy-state-current ivy-last)
-         (if (and ivy--directory
-                  (not (eq (ivy-state-history ivy-last) 'grep-files-history)))
-             (expand-file-name text ivy--directory)
-           text)))
-  (setq ivy-exit 'done)
-  (exit-minibuffer))
+  (if (member (ivy-state-prompt ivy-last) '("Create directory: " "Make 
directory: "))
+      (ivy-immediate-done)
+    (insert
+     (setf (ivy-state-current ivy-last)
+           (if (and ivy--directory
+                    (not (eq (ivy-state-history ivy-last) 
'grep-files-history)))
+               (expand-file-name text ivy--directory)
+             text)))
+    (setq ivy-exit 'done)
+    (exit-minibuffer)))
 
 (defcustom ivy-use-selectable-prompt nil
   "When non-nil, make the prompt line selectable like a candidate.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]