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

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

[elpa] externals/ivy-hydra a0063ce 224/395: ivy.el (ivy--done): Revert i


From: Basil L. Contovounesios
Subject: [elpa] externals/ivy-hydra a0063ce 224/395: ivy.el (ivy--done): Revert ivy-set-text
Date: Thu, 25 Feb 2021 08:32:07 -0500 (EST)

branch: externals/ivy-hydra
commit a0063ce9bfe60d641173a097981e0c6d6504149c
Author: Oleh Krehel <ohwoeowho@gmail.com>
Commit: Oleh Krehel <ohwoeowho@gmail.com>

    ivy.el (ivy--done): Revert ivy-set-text
    
    Fixes #2524
    Re #2526
    Fixes #2533
---
 ivy.el | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ivy.el b/ivy.el
index 1a46d91..1aa968b 100644
--- a/ivy.el
+++ b/ivy.el
@@ -740,8 +740,7 @@ N is obtained from `ivy-more-chars-alist'."
              (if (and ivy--directory
                       (not (eq (ivy-state-history ivy-last) 
'grep-files-history)))
                  (expand-file-name text ivy--directory)
-               text)))
-      (ivy-set-text (ivy--input)))
+               text))))
     (setq ivy-exit 'done)
     (exit-minibuffer)))
 
@@ -2280,12 +2279,11 @@ customizations apply to the current completion session."
     (ivy-call)))
 
 (defun ivy--update-history (hist)
-  (let ((item (if ivy--directory
-                  (ivy-state-current ivy-last)
-                ivy-text)))
-    (unless (equal item "")
-      (set hist (cons (propertize item 'ivy-index ivy--index)
-                      (delete item (symbol-value hist)))))))
+  (let ((item (ivy-state-current ivy-last)))
+    (cond ((equal item ""))
+          ((stringp item)
+           (set hist (cons (propertize item 'ivy-index ivy--index)
+                           (delete item (symbol-value hist))))))))
 
 (defun ivy--cleanup ()
   ;; Fixes a bug in ESS, #1660



reply via email to

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