[elpa] master 122215e: Go to isearch left end when starting replace

[Michael Heerdegen]

branch: master
commit 122215ea485bb61d4863085815b799dd707f3a56
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>

    Go to isearch left end when starting replace
    
    with el-search from isearch
    
    This partially reverts
    
    "When coming from isearch, don't move to other end".
---
 packages/el-search/el-search.el |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index f6c8c48..2f69f5f 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -952,8 +952,13 @@ Hit any key to proceed."
   (barf-if-buffer-read-only)
   (el-search-search-and-replace-pattern from to mapping))
 
-(defun el-search--take-over-from-isearch ()
-  (prog1 isearch-string (isearch-exit)))
+(defun el-search--take-over-from-isearch (&optional goto-left-end)
+  (let ((other-end (and goto-left-end isearch-other-end))
+        (input isearch-string))
+    (isearch-exit)
+    (when (and other-end (< other-end (point)))
+      (goto-char other-end))
+    input))
 
 ;;;###autoload
 (defun el-search-search-from-isearch ()
@@ -968,7 +973,7 @@ Hit any key to proceed."
 ;;;###autoload
 (defun el-search-replace-from-isearch ()
   (interactive)
-  (let ((el-search--initial-mb-contents (concat "'" 
(el-search--take-over-from-isearch))))
+  (let ((el-search--initial-mb-contents (concat "'" 
(el-search--take-over-from-isearch t))))
     (call-interactively #'el-search-query-replace)))