mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

(Info-search): Use search-whitespace-regexp.

Browse Source
This commit is contained in:
Richard M. Stallman 2004-11-19 20:04:44 +00:00
parent ecdb561eb4
commit 5d4faedacc
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lisp/info.el
View File

@ -1468,10 +1468,6 @@ If DIRECTION is `backward', search in the reverse direction."
(opoint-max (point-max)) (opoint-max (point-max))
(ostart (window-start)) (ostart (window-start))
(osubfile Info-current-subfile)) (osubfile Info-current-subfile))
(when Info-search-whitespace-regexp
(setq regexp
(mapconcat 'identity (split-string regexp "[ \t\n]+")
Info-search-whitespace-regexp)))
(setq Info-search-case-fold case-fold-search) (setq Info-search-case-fold case-fold-search)
(save-excursion (save-excursion
(save-restriction (save-restriction
@ -1496,12 +1492,14 @@ If DIRECTION is `backward', search in the reverse direction."
(save-excursion (save-excursion
(and (search-backward "\^_" nil t) (and (search-backward "\^_" nil t)
(looking-at "\^_\nTag Table")))))) (looking-at "\^_\nTag Table"))))))
(if (if backward (let ((search-whitespace-regexp
(re-search-backward regexp bound t) Info-search-whitespace-regexp))
(re-search-forward regexp bound t)) (if (if backward
(setq found (point) beg-found (if backward (match-end 0) (re-search-backward regexp bound t)
(match-beginning 0))) (re-search-forward regexp bound t))
(setq give-up t))))) (setq found (point) beg-found (if backward (match-end 0)
(match-beginning 0)))
(setq give-up t))))))
;; If no subfiles, give error now. ;; If no subfiles, give error now.
(if give-up (if give-up
(if (null Info-current-subfile) (if (null Info-current-subfile)