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

[Juri Linkov]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.416 emacs/lisp/info.el:1.417
*** emacs/lisp/info.el:1.416    Wed Feb  9 15:50:42 2005
--- emacs/lisp/info.el  Wed Feb 23 17:03:17 2005
***************
*** 201,206 ****
--- 201,215 ----
    :type 'regexp
    :group 'info)
  
+ (defcustom Info-isearch-search t
+   "*If non-nil, isearch invoked in Info mode uses `Info-search' function.
+ This allows isearch to search through multiple nodes.
+ When isearch fails, it wraps and restarts the search from the
+ top/final node depending on search direction."
+   :version "22.1"
+   :type 'boolean
+   :group 'info)
+ 
  (defcustom Info-mode-hook
    ;; Try to obey obsolete Info-fontify settings.
    (unless (and (boundp 'Info-fontify) (null Info-fontify))
***************
*** 1637,1659 ****
    (Info-search regexp bound noerror count 'backward))
  
  (defun Info-isearch-search ()
!   (cond
!    (isearch-word
!     (if isearch-forward 'word-search-forward 'word-search-backward))
!    (isearch-regexp
!     (lambda (regexp bound noerror)
!       (condition-case nil
!           (progn
!             (Info-search regexp bound noerror nil
!                          (unless isearch-forward 'backward))
!             (point))
!         (error nil))))
!    (t
!     (if isearch-forward 'search-forward 'search-backward))))
  
  (defun Info-isearch-wrap ()
!   (if isearch-regexp
!       (if isearch-forward (Info-top-node) (Info-final-node))
      (goto-char (if isearch-forward (point-min) (point-max)))))
  
  (defun Info-isearch-push-state ()
--- 1646,1666 ----
    (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))
!             (point))
!         (error nil)))
!     (let ((isearch-search-fun-function nil))
!       (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)))))
  
  (defun Info-isearch-push-state ()