aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2008-11-17 00:43:58 +0000
committerJuri Linkov2008-11-17 00:43:58 +0000
commita2c72e6cb904c3f21da95c8840f80343c362edcd (patch)
tree516b56a50af33776c111e19fa0d03a8942a4c7ed
parent43533626b3152cd589c43ed2c1b1c7da459b705e (diff)
downloademacs-a2c72e6cb904c3f21da95c8840f80343c362edcd.tar.gz
emacs-a2c72e6cb904c3f21da95c8840f80343c362edcd.zip
(Info-search, Info-mode): Rename
`isearch-success-function' to `isearch-filter-predicate'. (Info-isearch-filter-predicate): Rename from `Info-search-success-function'.
-rw-r--r--lisp/info.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/info.el b/lisp/info.el
index 78e3f2ef70c..15a557ad946 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1660,7 +1660,7 @@ If DIRECTION is `backward', search in the reverse direction."
1660 (point-max))) 1660 (point-max)))
1661 (while (and (not give-up) 1661 (while (and (not give-up)
1662 (or (null found) 1662 (or (null found)
1663 (not (funcall isearch-success-function beg-found found)))) 1663 (not (funcall isearch-filter-predicate beg-found found))))
1664 (let ((search-spaces-regexp 1664 (let ((search-spaces-regexp
1665 (if (or (not isearch-mode) isearch-regexp) 1665 (if (or (not isearch-mode) isearch-regexp)
1666 Info-search-whitespace-regexp))) 1666 Info-search-whitespace-regexp)))
@@ -1740,7 +1740,7 @@ If DIRECTION is `backward', search in the reverse direction."
1740 (setq give-up nil found nil) 1740 (setq give-up nil found nil)
1741 (while (and (not give-up) 1741 (while (and (not give-up)
1742 (or (null found) 1742 (or (null found)
1743 (not (funcall isearch-success-function beg-found found)))) 1743 (not (funcall isearch-filter-predicate beg-found found))))
1744 (let ((search-spaces-regexp 1744 (let ((search-spaces-regexp
1745 (if (or (not isearch-mode) isearch-regexp) 1745 (if (or (not isearch-mode) isearch-regexp)
1746 Info-search-whitespace-regexp))) 1746 Info-search-whitespace-regexp)))
@@ -1847,7 +1847,7 @@ If DIRECTION is `backward', search in the reverse direction."
1847(defun Info-isearch-start () 1847(defun Info-isearch-start ()
1848 (setq Info-isearch-initial-node nil)) 1848 (setq Info-isearch-initial-node nil))
1849 1849
1850(defun Info-search-success-function (beg-found found) 1850(defun Info-isearch-filter-predicate (beg-found found)
1851 "Skip invisible text, node header line and Tag Table node." 1851 "Skip invisible text, node header line and Tag Table node."
1852 (save-match-data 1852 (save-match-data
1853 (let ((backward (< found beg-found))) 1853 (let ((backward (< found beg-found)))
@@ -3533,8 +3533,8 @@ Advanced commands:
3533 'Info-isearch-wrap) 3533 'Info-isearch-wrap)
3534 (set (make-local-variable 'isearch-push-state-function) 3534 (set (make-local-variable 'isearch-push-state-function)
3535 'Info-isearch-push-state) 3535 'Info-isearch-push-state)
3536 (set (make-local-variable 'isearch-success-function) 3536 (set (make-local-variable 'isearch-filter-predicate)
3537 'Info-search-success-function) 3537 'Info-isearch-filter-predicate)
3538 (set (make-local-variable 'search-whitespace-regexp) 3538 (set (make-local-variable 'search-whitespace-regexp)
3539 Info-search-whitespace-regexp) 3539 Info-search-whitespace-regexp)
3540 (set (make-local-variable 'revert-buffer-function) 3540 (set (make-local-variable 'revert-buffer-function)