[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Sun, 28 Nov 2004 10:47:33 -0500 |
Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.411 emacs/lisp/info.el:1.412
*** emacs/lisp/info.el:1.411 Sat Nov 20 14:09:10 2004
--- emacs/lisp/info.el Sun Nov 28 15:41:16 2004
***************
*** 188,194 ****
:type 'boolean
:group 'info)
! (defcustom Info-search-whitespace-regexp "\\(?:\\s-+\\)"
"*If non-nil, regular expression to match a sequence of whitespace chars.
This applies to Info search for regular expressions.
You might want to use something like \"[ \\t\\r\\n]+\" instead.
--- 188,194 ----
:type 'boolean
:group 'info)
! (defcustom Info-search-whitespace-regexp "\\s-+"
"*If non-nil, regular expression to match a sequence of whitespace chars.
This applies to Info search for regular expressions.
You might want to use something like \"[ \\t\\r\\n]+\" instead.
***************
*** 1486,1499 ****
(isearch-range-invisible found beg-found)
(isearch-range-invisible beg-found found))
;; Skip node header line
! (save-excursion (forward-line -1)
! (looking-at "\^_"))
;; Skip Tag Table node
(save-excursion
(and (search-backward "\^_" nil t)
(looking-at "\^_\nTag Table"))))))
! (let ((search-spaces-regexp
! Info-search-whitespace-regexp))
(if (if backward
(re-search-backward regexp bound t)
(re-search-forward regexp bound t))
--- 1486,1499 ----
(isearch-range-invisible found beg-found)
(isearch-range-invisible beg-found found))
;; Skip node header line
! (and (save-excursion (forward-line -1)
! (looking-at "\^_"))
! (forward-line 1))
;; Skip Tag Table node
(save-excursion
(and (search-backward "\^_" nil t)
(looking-at "\^_\nTag Table"))))))
! (let ((search-spaces-regexp Info-search-whitespace-regexp))
(if (if backward
(re-search-backward regexp bound t)
(re-search-forward regexp bound t))
***************
*** 1503,1511 ****
;; If no subfiles, give error now.
(if give-up
(if (null Info-current-subfile)
! (if backward
! (re-search-backward regexp)
! (re-search-forward regexp))
(setq found nil)))
(unless (or found bound)
--- 1503,1512 ----
;; If no subfiles, give error now.
(if give-up
(if (null Info-current-subfile)
! (let ((search-spaces-regexp Info-search-whitespace-regexp))
! (if backward
! (re-search-backward regexp)
! (re-search-forward regexp)))
(setq found nil)))
(unless (or found bound)
***************
*** 1561,1578 ****
(isearch-range-invisible found beg-found)
(isearch-range-invisible beg-found found))
;; Skip node header line
! (save-excursion (forward-line -1)
! (looking-at "\^_"))
;; Skip Tag Table node
(save-excursion
(and (search-backward "\^_" nil t)
(looking-at "\^_\nTag Table"))))))
! (if (if backward
! (re-search-backward regexp nil t)
! (re-search-forward regexp nil t))
! (setq found (point) beg-found (if backward (match-end 0)
! (match-beginning 0)))
! (setq give-up t)))
(if give-up
(setq found nil))
(if found
--- 1562,1581 ----
(isearch-range-invisible found beg-found)
(isearch-range-invisible beg-found found))
;; Skip node header line
! (and (save-excursion (forward-line -1)
! (looking-at "\^_"))
! (forward-line 1))
;; Skip Tag Table node
(save-excursion
(and (search-backward "\^_" nil t)
(looking-at "\^_\nTag Table"))))))
! (let ((search-spaces-regexp Info-search-whitespace-regexp))
! (if (if backward
! (re-search-backward regexp nil t)
! (re-search-forward regexp nil t))
! (setq found (point) beg-found (if backward (match-end 0)
! (match-beginning 0)))
! (setq give-up t))))
(if give-up
(setq found nil))
(if found