aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/replace.el
diff options
context:
space:
mode:
authorArtur Malabarba2015-10-21 17:07:08 +0100
committerArtur Malabarba2015-10-21 17:11:09 +0100
commitab65b33f8c67d5341dae21fc03053e6202077d90 (patch)
tree0f175a887740e61717856e71c1e97f6c70b9d7d3 /lisp/replace.el
parentf6ece2420c3dc6f3dde06c7f8722f5b0b7e1ef4a (diff)
downloademacs-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/replace.el')
-rw-r--r--lisp/replace.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/replace.el b/lisp/replace.el
index 3a908ac4d8d..d6590c5516a 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2013,7 +2013,7 @@ It is called with three arguments, as if it were
2013 ;; outside of this function because then another I-search 2013 ;; outside of this function because then another I-search
2014 ;; used after `recursive-edit' might override them. 2014 ;; used after `recursive-edit' might override them.
2015 (let* ((isearch-regexp regexp-flag) 2015 (let* ((isearch-regexp regexp-flag)
2016 (isearch-word (or delimited-flag 2016 (isearch-regexp-function (or delimited-flag
2017 (and replace-character-fold 2017 (and replace-character-fold
2018 (not regexp-flag) 2018 (not regexp-flag)
2019 #'character-fold-to-regexp))) 2019 #'character-fold-to-regexp)))
@@ -2046,7 +2046,7 @@ It is called with three arguments, as if it were
2046 (if query-replace-lazy-highlight 2046 (if query-replace-lazy-highlight
2047 (let ((isearch-string search-string) 2047 (let ((isearch-string search-string)
2048 (isearch-regexp regexp-flag) 2048 (isearch-regexp regexp-flag)
2049 (isearch-word delimited-flag) 2049 (isearch-regexp-function delimited-flag)
2050 (isearch-lax-whitespace 2050 (isearch-lax-whitespace
2051 replace-lax-whitespace) 2051 replace-lax-whitespace)
2052 (isearch-regexp-lax-whitespace 2052 (isearch-regexp-lax-whitespace