[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master df283ac 16/22: el-search--read-pattern: fix default(s)
From: |
Michael Heerdegen |
Subject: |
[elpa] master df283ac 16/22: el-search--read-pattern: fix default(s) |
Date: |
Sat, 31 Oct 2015 18:41:41 +0000 |
branch: master
commit df283ac0bf6b19d7afdfa882fd3bb786b8e0012a
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
el-search--read-pattern: fix default(s)
---
packages/el-search/el-search.el | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index e2f1b5a..13bfdfa 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/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
- [elpa] master 61c3b71 13/22: require cl-lib only at compile time, (continued)
- [elpa] master 61c3b71 13/22: require cl-lib only at compile time, Michael Heerdegen, 2015/10/31
- [elpa] master 1a1a49d 17/22: spelling fixes, Michael Heerdegen, 2015/10/31
- [elpa] master c546111 14/22: on-screen: bump version, Michael Heerdegen, 2015/10/31
- [elpa] master 18683a6 09/22: fix el-search-hl-post-command-fun auto-removal, Michael Heerdegen, 2015/10/31
- [elpa] master 7371526 10/22: document el-search--do-subsexps, Michael Heerdegen, 2015/10/31
- [elpa] master 96959c6 19/22: improve docs; new: el-search-defpattern; add some pattern types, Michael Heerdegen, 2015/10/31
- [elpa] master 6319bbd 20/22: remove search wrapping functionality, Michael Heerdegen, 2015/10/31
- [elpa] master 88d869d 12/22: new package: on-screen, Michael Heerdegen, 2015/10/31
- [elpa] master 02add7a 15/22: give feedback in the echo area again, Michael Heerdegen, 2015/10/31
- [elpa] master 4e3d672 21/22: simplify el-search-hl-post-command-fun, Michael Heerdegen, 2015/10/31
- [elpa] master df283ac 16/22: el-search--read-pattern: fix default(s),
Michael Heerdegen <=
- [elpa] master a91ed2f 22/22: el-search: bump version to 0.1, Michael Heerdegen, 2015/10/31