diff options
| author | Artur Malabarba | 2015-10-21 17:07:08 +0100 |
|---|---|---|
| committer | Artur Malabarba | 2015-10-21 17:11:09 +0100 |
| commit | ab65b33f8c67d5341dae21fc03053e6202077d90 (patch) | |
| tree | 0f175a887740e61717856e71c1e97f6c70b9d7d3 /lisp/info.el | |
| parent | f6ece2420c3dc6f3dde06c7f8722f5b0b7e1ef4a (diff) | |
| download | emacs-ab65b33f8c67d5341dae21fc03053e6202077d90.tar.gz emacs-ab65b33f8c67d5341dae21fc03053e6202077d90.zip | |
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
Diffstat (limited to 'lisp/info.el')
| -rw-r--r-- | lisp/info.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/info.el b/lisp/info.el index bd12d568291..b11330b1430 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -2114,14 +2114,14 @@ If DIRECTION is `backward', search in the reverse direction." | |||
| 2114 | search-whitespace-regexp))) | 2114 | search-whitespace-regexp))) |
| 2115 | (Info-search | 2115 | (Info-search |
| 2116 | (cond | 2116 | (cond |
| 2117 | (isearch-word | 2117 | (isearch-regexp-function |
| 2118 | ;; Lax version of word search | 2118 | ;; Lax version of word search |
| 2119 | (let ((lax (not (or isearch-nonincremental | 2119 | (let ((lax (not (or isearch-nonincremental |
| 2120 | (eq (length string) | 2120 | (eq (length string) |
| 2121 | (length (isearch--state-string | 2121 | (length (isearch--state-string |
| 2122 | (car isearch-cmds)))))))) | 2122 | (car isearch-cmds)))))))) |
| 2123 | (if (functionp isearch-word) | 2123 | (if (functionp isearch-regexp-function) |
| 2124 | (funcall isearch-word string lax) | 2124 | (funcall isearch-regexp-function string lax) |
| 2125 | (word-search-regexp string lax)))) | 2125 | (word-search-regexp string lax)))) |
| 2126 | (isearch-regexp string) | 2126 | (isearch-regexp string) |
| 2127 | (t (regexp-quote string))) | 2127 | (t (regexp-quote string))) |