summaryrefslogtreecommitdiff
path: root/lisp/misearch.el
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2012-05-29 12:09:38 +0300
committerJuri Linkov <juri@jurta.org>2012-05-29 12:09:38 +0300
commit8cbd80f7138bcf61518ecaab76d1b762b2510c21 (patch)
treec16f740545d0a9fcb473f7f4b3726cbd5c37f245 /lisp/misearch.el
parentc846da43835e99fa53c772814aa43c9ae7ac571b (diff)
downloademacs-8cbd80f7138bcf61518ecaab76d1b762b2510c21.tar.gz
* lisp/isearch.el (isearch-search-fun-default): New function.
(isearch-search-fun): Move default part to the new function `isearch-search-fun-default'. (isearch-search-fun-function): Set the default value to `isearch-search-fun-default'. * lisp/comint.el (comint-history-isearch-end): Use `isearch-search-fun-default'. (comint-history-isearch-search): Use `isearch-search-fun-default' and remove spacial case for `isearch-word'. (comint-history-isearch-wrap): Remove spacial case for `isearch-word'. * lisp/hexl.el (hexl-isearch-search-function): Use `isearch-search-fun-default'. * lisp/info.el (Info-isearch-search): Use `isearch-search-fun-default'. Use `word-search-regexp' for `isearch-word'. * lisp/misearch.el (multi-isearch-search-fun): Use `isearch-search-fun-default'. * lisp/simple.el (minibuffer-history-isearch-search): Use `isearch-search-fun-default' and remove spacial case for `isearch-word'. (minibuffer-history-isearch-wrap): Remove spacial case for `isearch-word'. * lisp/textmodes/reftex-global.el (reftex-isearch-wrap-function): Remove spacial case for `isearch-word'. (reftex-isearch-isearch-search): Use `isearch-search-fun-default'. Fixes: debbugs:11381
Diffstat (limited to 'lisp/misearch.el')
-rw-r--r--lisp/misearch.el8
1 files changed, 1 insertions, 7 deletions
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 22021bac570..4848b6691bc 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -130,13 +130,7 @@ Intended to be added to `isearch-mode-hook'."
(lambda (string bound noerror)
(let ((search-fun
;; Use standard functions to search within one buffer
- (cond
- (isearch-word
- (if isearch-forward 'word-search-forward 'word-search-backward))
- (isearch-regexp
- (if isearch-forward 're-search-forward 're-search-backward))
- (t
- (if isearch-forward 'search-forward 'search-backward))))
+ (isearch-search-fun-default))
found buffer)
(or
;; 1. First try searching in the initial buffer