Mercurial > emacs
changeset 100669:1cc573a37101
(Info-find-node-2): Use negative offset 2 instead of 1
for Info-point-loc since it is more correct in all cases.
(Info-isearch-filter): Rename from
`Info-isearch-filter-predicate'. Doc fix.
(Info-mode): Replace `Info-isearch-filter-predicate' with
`Info-isearch-filter'.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Tue, 23 Dec 2008 21:02:40 +0000 |
| parents | f05bf71fe0fb |
| children | 3a213a83e9a6 |
| files | lisp/info.el |
| diffstat | 1 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/info.el Tue Dec 23 21:02:17 2008 +0000 +++ b/lisp/info.el Tue Dec 23 21:02:40 2008 +0000 @@ -1007,7 +1007,7 @@ (delete new-history Info-history-list)))) (goto-char anchorpos)) ((numberp Info-point-loc) - (forward-line (1- Info-point-loc)) + (forward-line (- Info-point-loc 2)) (setq Info-point-loc nil)) ((stringp Info-point-loc) (Info-find-index-name Info-point-loc) @@ -1855,8 +1855,10 @@ ;; Otherwise this variable is set after first search failure. (and isearch-nonincremental Info-current-node))) -(defun Info-isearch-filter-predicate (beg-found found) - "Skip invisible text, node header line and Tag Table node." +(defun Info-isearch-filter (beg-found found) + "Test whether the current search hit is a visible useful text. +Return non-nil if the text from BEG-FOUND to FOUND is visible +and is not in the header line or a tag table." (save-match-data (let ((backward (< found beg-found))) (not @@ -3540,7 +3542,7 @@ (set (make-local-variable 'isearch-push-state-function) 'Info-isearch-push-state) (set (make-local-variable 'isearch-filter-predicate) - 'Info-isearch-filter-predicate) + 'Info-isearch-filter) (set (make-local-variable 'search-whitespace-regexp) Info-search-whitespace-regexp) (set (make-local-variable 'revert-buffer-function)