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

[Juri Linkov]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.417 emacs/lisp/info.el:1.418
*** emacs/lisp/info.el:1.417    Wed Feb 23 17:03:17 2005
--- emacs/lisp/info.el  Tue Mar  8 21:50:11 2005
***************
*** 1646,1655 ****
    (Info-search regexp bound noerror count 'backward))
  
  (defun Info-isearch-search ()
!   (if (and Info-isearch-search (not isearch-word))
        (lambda (string &optional bound noerror count)
        (condition-case nil
!           (progn
              (Info-search (if isearch-regexp string (regexp-quote string))
                           bound noerror count
                           (unless isearch-forward 'backward))
--- 1646,1661 ----
    (Info-search regexp bound noerror count 'backward))
  
  (defun Info-isearch-search ()
!   (if Info-isearch-search
        (lambda (string &optional bound noerror count)
        (condition-case nil
!           (if isearch-word
!               (Info-search (concat "\\b" (replace-regexp-in-string
!                                           "\\W+" "\\\\W+"
!                                           (replace-regexp-in-string
!                                            "^\\W+\\|\\W+$" "" string)) "\\b")
!                            bound noerror count
!                            (unless isearch-forward 'backward))
              (Info-search (if isearch-regexp string (regexp-quote string))
                           bound noerror count
                           (unless isearch-forward 'backward))
***************
*** 1659,1665 ****
        (isearch-search-fun))))
  
  (defun Info-isearch-wrap ()
!   (when (and Info-isearch-search (not isearch-word))
      (if isearch-forward (Info-top-node) (Info-final-node))
      (goto-char (if isearch-forward (point-min) (point-max)))))
  
--- 1665,1671 ----
        (isearch-search-fun))))
  
  (defun Info-isearch-wrap ()
!   (when Info-isearch-search
      (if isearch-forward (Info-top-node) (Info-final-node))
      (goto-char (if isearch-forward (point-min) (point-max)))))