aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2007-07-23 20:29:10 +0000
committerJuri Linkov2007-07-23 20:29:10 +0000
commitac475d3a720d3f0650061411d40403d6f9bba04d (patch)
tree1b985c5c695a7e7574363ee4df9f536d19b4c885
parent33e0847dbb9cd7e86eb97eed9e810b540849f8d5 (diff)
downloademacs-ac475d3a720d3f0650061411d40403d6f9bba04d.tar.gz
emacs-ac475d3a720d3f0650061411d40403d6f9bba04d.zip
(isearch-message-function): New variable.
(isearch-update, isearch-search): Use it.
-rw-r--r--lisp/isearch.el12
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 00e7f1cc306..8c997be2de2 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -164,6 +164,10 @@ is non-nil if the user quit the search.")
164(defvar isearch-mode-end-hook-quit nil 164(defvar isearch-mode-end-hook-quit nil
165 "Non-nil while running `isearch-mode-end-hook' if user quit the search.") 165 "Non-nil while running `isearch-mode-end-hook' if user quit the search.")
166 166
167(defvar isearch-message-function nil
168 "Function to call to display the search prompt.
169If nil, use `isearch-message'.")
170
167(defvar isearch-wrap-function nil 171(defvar isearch-wrap-function nil
168 "Function to call to wrap the search when search is failed. 172 "Function to call to wrap the search when search is failed.
169If nil, move point to the beginning of the buffer for a forward search, 173If nil, move point to the beginning of the buffer for a forward search,
@@ -715,7 +719,9 @@ is treated as a regexp. See \\[isearch-forward] for more info."
715 (null executing-kbd-macro)) 719 (null executing-kbd-macro))
716 (progn 720 (progn
717 (if (not (input-pending-p)) 721 (if (not (input-pending-p))
718 (isearch-message)) 722 (if isearch-message-function
723 (funcall isearch-message-function)
724 (isearch-message)))
719 (if (and isearch-slow-terminal-mode 725 (if (and isearch-slow-terminal-mode
720 (not (or isearch-small-window 726 (not (or isearch-small-window
721 (pos-visible-in-window-p)))) 727 (pos-visible-in-window-p))))
@@ -2035,7 +2041,9 @@ Can be changed via `isearch-search-fun-function' for special needs."
2035 2041
2036(defun isearch-search () 2042(defun isearch-search ()
2037 ;; Do the search with the current search string. 2043 ;; Do the search with the current search string.
2038 (isearch-message nil t) 2044 (if isearch-message-function
2045 (funcall isearch-message-function nil t)
2046 (isearch-message nil t))
2039 (if (and (eq isearch-case-fold-search t) search-upper-case) 2047 (if (and (eq isearch-case-fold-search t) search-upper-case)
2040 (setq isearch-case-fold-search 2048 (setq isearch-case-fold-search
2041 (isearch-no-upper-case-p isearch-string isearch-regexp))) 2049 (isearch-no-upper-case-p isearch-string isearch-regexp)))