[elpa] externals/el-search 7c42a31 036/332: el-search--read-pattern: fix default(s)

[Stefan Monnier]

branch: externals/el-search
commit 7c42a3151c658a29b341b768d6bf290b30c535c0
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>

    el-search--read-pattern: fix default(s)
---
 el-search.el | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/el-search.el b/el-search.el
index e2f1b5a..13bfdfa 100644
--- a/el-search.el
+++ b/el-search.el
@@ -236,11 +236,17 @@ prompt to refer to the value of the currently tested 
expression."
                           (or hist 'read-expression-history) default)))
 
 (defun el-search--read-pattern (prompt &optional default read)
-  (el-search-read-expression
-   prompt el-search--initial-mb-contents 'el-search-history
-   (or default (when-let ((this-sexp (sexp-at-point)))
-                 (concat "'" (el-search--print this-sexp))))
-   read))
+  (let ((this-sexp (sexp-at-point)))
+    (minibuffer-with-setup-hook
+        (lambda ()
+          (when this-sexp
+            (let ((more-defaults (list (concat "'" (el-search--print 
this-sexp)))))
+              (setq-local minibuffer-default-add-function
+                          (lambda () (if (listp minibuffer-default)
+                                    (append minibuffer-default more-defaults)
+                                  (cons minibuffer-default more-defaults)))))))
+      (el-search-read-expression 
+       prompt el-search--initial-mb-contents 'el-search-history default 
read))))
 
 (defun el-search--end-of-sexp ()
   ;;Point must be at sexp beginning