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

[Richard M . Stallman]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.409 emacs/lisp/info.el:1.410
*** emacs/lisp/info.el:1.409    Thu Nov 11 21:43:47 2004
--- emacs/lisp/info.el  Fri Nov 19 20:04:44 2004
***************
*** 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 ----
***************
*** 1496,1507 ****
                            (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)
--- 1492,1505 ----
                            (save-excursion
                              (and (search-backward "\^_" nil t)
                                   (looking-at "\^_\nTag Table"))))))
!           (let ((search-whitespace-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)