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

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

[elpa] externals/ivy-hydra e0374dc 385/395: Support empty isearch in swi


From: Basil L. Contovounesios
Subject: [elpa] externals/ivy-hydra e0374dc 385/395: Support empty isearch in swiper-from-isearch
Date: Thu, 25 Feb 2021 08:32:44 -0500 (EST)

branch: externals/ivy-hydra
commit e0374dc0bbcd8ab0ec24baf308d331251d4f9c49
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Support empty isearch in swiper-from-isearch
    
    * swiper.el (swiper-from-isearch): Exit isearch even if no search
    string has been entered.
    
    Fixes #2799.
---
 swiper.el | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/swiper.el b/swiper.el
index 56f6e43..2d991d1 100644
--- a/swiper.el
+++ b/swiper.el
@@ -1141,11 +1141,11 @@ WND, when specified is the window."
 (defun swiper-from-isearch ()
   "Invoke `swiper' from isearch."
   (interactive)
-  (let ((query (if isearch-regexp
-                   isearch-string
-                 (regexp-quote isearch-string))))
-    (isearch-exit)
-    (swiper query)))
+  (swiper (prog1 (if isearch-regexp
+                     isearch-string
+                   (regexp-quote isearch-string))
+            (let ((search-nonincremental-instead nil))
+              (isearch-exit)))))
 
 (defvar swiper-multi-buffers nil
   "Store the current list of buffers.")



reply via email to

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