Mercurial > emacs
comparison lisp/info.el @ 58331:c11ef32aabb7
(Info-search): Use search-whitespace-regexp.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Fri, 19 Nov 2004 20:04:44 +0000 |
parents | f3726ecfee76 |
children | f6adc85f8510 |
comparison
equal
deleted
inserted
replaced
58330:5be8a633ec57 | 58331:c11ef32aabb7 |
---|---|
1466 (opoint (point)) | 1466 (opoint (point)) |
1467 (opoint-min (point-min)) | 1467 (opoint-min (point-min)) |
1468 (opoint-max (point-max)) | 1468 (opoint-max (point-max)) |
1469 (ostart (window-start)) | 1469 (ostart (window-start)) |
1470 (osubfile Info-current-subfile)) | 1470 (osubfile Info-current-subfile)) |
1471 (when Info-search-whitespace-regexp | |
1472 (setq regexp | |
1473 (mapconcat 'identity (split-string regexp "[ \t\n]+") | |
1474 Info-search-whitespace-regexp))) | |
1475 (setq Info-search-case-fold case-fold-search) | 1471 (setq Info-search-case-fold case-fold-search) |
1476 (save-excursion | 1472 (save-excursion |
1477 (save-restriction | 1473 (save-restriction |
1478 (widen) | 1474 (widen) |
1479 (when backward | 1475 (when backward |
1494 (looking-at "\^_")) | 1490 (looking-at "\^_")) |
1495 ;; Skip Tag Table node | 1491 ;; Skip Tag Table node |
1496 (save-excursion | 1492 (save-excursion |
1497 (and (search-backward "\^_" nil t) | 1493 (and (search-backward "\^_" nil t) |
1498 (looking-at "\^_\nTag Table")))))) | 1494 (looking-at "\^_\nTag Table")))))) |
1499 (if (if backward | 1495 (let ((search-whitespace-regexp |
1500 (re-search-backward regexp bound t) | 1496 Info-search-whitespace-regexp)) |
1501 (re-search-forward regexp bound t)) | 1497 (if (if backward |
1502 (setq found (point) beg-found (if backward (match-end 0) | 1498 (re-search-backward regexp bound t) |
1503 (match-beginning 0))) | 1499 (re-search-forward regexp bound t)) |
1504 (setq give-up t))))) | 1500 (setq found (point) beg-found (if backward (match-end 0) |
1501 (match-beginning 0))) | |
1502 (setq give-up t)))))) | |
1505 ;; If no subfiles, give error now. | 1503 ;; If no subfiles, give error now. |
1506 (if give-up | 1504 (if give-up |
1507 (if (null Info-current-subfile) | 1505 (if (null Info-current-subfile) |
1508 (if backward | 1506 (if backward |
1509 (re-search-backward regexp) | 1507 (re-search-backward regexp) |