comparison lisp/info.el @ 60615:643e6516a779

(Info-isearch-initial-node): New internal variable. (Info-search): Signal an error in isearch mode when search leaves the initial node. Signal an error when `bound' is non-nil and nothing was found in the current subfile. (Info-isearch-search): Remove `condition-case'. (Info-isearch-wrap): Don't wrap when search failed during leaving the initial node. If `Info-isearch-search' is nil, wrap around the current node. (Info-isearch-start): New fun. (Info-mode): Add buffer-local hook `Info-isearch-start' to `isearch-mode-hook'.

60614:50f2c823523a

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))
    '(turn-on-font-lock))

		      (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)
	(unwind-protect
	    ;; Try other subfiles.
	    (let ((list ()))

  (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))
	      (point))
	  (error nil)))
    (let ((isearch-search-fun-function nil))
      (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)))))

(defun Info-isearch-push-state ()
  `(lambda (cmd)
     (Info-isearch-pop-state cmd ,Info-current-file ,Info-current-node)))

(defun Info-isearch-pop-state (cmd file node)
  (or (and (string= Info-current-file file)
           (string= Info-current-node node))
      (progn (Info-find-node file node) (sit-for 0))))


(defun Info-extract-pointer (name &optional errorname)
  "Extract the value of the node-pointer named NAME.
If there is none, use ERRORNAME in the error message;
if ERRORNAME is nil, just return nil."

  (setq line-move-ignore-invisible t)
  (make-local-variable 'desktop-save-buffer)
  (setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
  (add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
  (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
  (set (make-local-variable 'isearch-search-fun-function)
       'Info-isearch-search)
  (set (make-local-variable 'isearch-wrap-function)
       'Info-isearch-wrap)
  (set (make-local-variable 'isearch-push-state-function)

60615:643e6516a779

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)

(defvar Info-isearch-initial-node nil)

(defcustom Info-mode-hook
  ;; Try to obey obsolete Info-fontify settings.
  (unless (and (boundp 'Info-fontify) (null Info-fontify))
    '(turn-on-font-lock))

		      (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))))))

      (when (and isearch-mode Info-isearch-search
		 (not Info-isearch-initial-node)
		 (not bound)
		 (or give-up (and found (not (and (> found opoint-min)
						  (< found opoint-max))))))
	(signal 'search-failed (list regexp "initial node")))

      ;; 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)))

      (if (and bound (not found))
	  (signal 'search-failed (list regexp)))

      (unless (or found bound)
	(unwind-protect
	    ;; Try other subfiles.
	    (let ((list ()))

  (Info-search regexp bound noerror count 'backward))

(defun Info-isearch-search ()
  (if Info-isearch-search
      (lambda (string &optional bound noerror count)
	(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))
	  (point)))
    (let ((isearch-search-fun-function nil))
      (isearch-search-fun))))

(defun Info-isearch-wrap ()
  (if Info-isearch-search
      (if Info-isearch-initial-node
	  (progn
	    (if isearch-forward (Info-top-node) (Info-final-node))
	    (goto-char (if isearch-forward (point-min) (point-max))))
	(setq Info-isearch-initial-node Info-current-node)
	(setq isearch-wrapped nil))
    (goto-char (if isearch-forward (point-min) (point-max)))))

(defun Info-isearch-push-state ()
  `(lambda (cmd)
     (Info-isearch-pop-state cmd ,Info-current-file ,Info-current-node)))

(defun Info-isearch-pop-state (cmd file node)
  (or (and (string= Info-current-file file)
           (string= Info-current-node node))
      (progn (Info-find-node file node) (sit-for 0))))

(defun Info-isearch-start ()
  (setq Info-isearch-initial-node nil))

(defun Info-extract-pointer (name &optional errorname)
  "Extract the value of the node-pointer named NAME.
If there is none, use ERRORNAME in the error message;
if ERRORNAME is nil, just return nil."

  (setq line-move-ignore-invisible t)
  (make-local-variable 'desktop-save-buffer)
  (setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
  (add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
  (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
  (add-hook 'isearch-mode-hook 'Info-isearch-start nil t)
  (set (make-local-variable 'isearch-search-fun-function)
       'Info-isearch-search)
  (set (make-local-variable 'isearch-wrap-function)
       'Info-isearch-wrap)
  (set (make-local-variable 'isearch-push-state-function)