[Emacs-diffs] Changes to emacs/lisp/info.el [lexbind]

[Miles Bader]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.304.2.20 emacs/lisp/info.el:1.304.2.21
*** emacs/lisp/info.el:1.304.2.20       Fri Nov 12 04:21:14 2004
--- emacs/lisp/info.el  Wed Dec  8 23:36:20 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.
***************
*** 1468,1477 ****
          (opoint-max (point-max))
          (ostart (window-start))
          (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)
        (save-excursion
        (save-restriction
--- 1468,1473 ----
***************
*** 1490,1513 ****
                                (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 bound t)
!                   (re-search-forward regexp bound 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 give-up
          (if (null Info-current-subfile)
!             (if backward
!                   (re-search-backward regexp)
!                 (re-search-forward regexp))
            (setq found nil)))
  
        (unless (or found bound)
--- 1486,1512 ----
                                (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))
!                 (setq found (point) beg-found (if backward (match-end 0)
!                                                 (match-beginning 0)))
!               (setq give-up t))))))
        ;; 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)
***************
*** 1563,1580 ****
                                      (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