comparison lisp/info.el @ 85921:1915d983e65a

(Info-revert-buffer-function): New func. (Info-mode): Arrange to use it for reverting.

85920:e5cfe61bd903

	   ;; If called on a non-file buffer, make a fake file name.
	   (concat default-directory (buffer-name))))
  (Info-find-node-2 nil nodename))

;; It's perhaps a bit nasty to kill the *info* buffer to force a re-read,
;; but at least it keeps this routine (which is only for the benefit of
;; makeinfo-buffer) out of the way of normal operations.
;;
(defun Info-revert-find-node (filename nodename)
  "Go to an Info node FILENAME and NODENAME, re-reading disk contents.
When *info* is already displaying FILENAME and NODENAME, the window position
is preserved, if possible."

	  (forward-line pline)
	  (move-to-column pcolumn))
      ;; only add to the history when coming from a different file+node
      (if new-history
	  (setq Info-history (cons new-history Info-history))))))

(defun Info-find-in-tag-table-1 (marker regexp case-fold)
  "Find a node in a tag table.
MARKER specifies the buffer and position to start searching at.
REGEXP is a regular expression matching nodes or references.  Its first

With a zero prefix arg, put the name inside a function call to `info'."
  (interactive "P")
  (unless Info-current-node
    (error "No current Info node"))
  (let ((node (if (stringp Info-current-file)
		  (concat "(" (file-name-nondirectory Info-current-file) ")"
			  Info-current-node))))
    (if (zerop (prefix-numeric-value arg))
        (setq node (concat "(info \"" node "\")")))
    (unless (stringp Info-current-file)
      (setq node (format "(Info-find-node '%S '%S)"

       'Info-isearch-wrap)
  (set (make-local-variable 'isearch-push-state-function)
       'Info-isearch-push-state)
  (set (make-local-variable 'search-whitespace-regexp)
       Info-search-whitespace-regexp)
  (Info-set-mode-line)
  (run-mode-hooks 'Info-mode-hook))

;; When an Info buffer is killed, make sure the associated tags buffer
;; is killed too.

85921:1915d983e65a

	   ;; If called on a non-file buffer, make a fake file name.
	   (concat default-directory (buffer-name))))
  (Info-find-node-2 nil nodename))

;; It's perhaps a bit nasty to kill the *info* buffer to force a re-read,
;; but at least it keeps this routine (which is for makeinfo-buffer and
;; Info-revert-buffer-function) out of the way of normal operations.
;;
(defun Info-revert-find-node (filename nodename)
  "Go to an Info node FILENAME and NODENAME, re-reading disk contents.
When *info* is already displaying FILENAME and NODENAME, the window position
is preserved, if possible."

	  (forward-line pline)
	  (move-to-column pcolumn))
      ;; only add to the history when coming from a different file+node
      (if new-history
	  (setq Info-history (cons new-history Info-history))))))

(defun Info-revert-buffer-function (ignore-auto noconfirm)
  (when (or noconfirm (y-or-n-p "Revert info buffer? "))
    (Info-revert-find-node Info-current-file Info-current-node)
    (message "Reverted %s" Info-current-file)))

(defun Info-find-in-tag-table-1 (marker regexp case-fold)
  "Find a node in a tag table.
MARKER specifies the buffer and position to start searching at.
REGEXP is a regular expression matching nodes or references.  Its first

With a zero prefix arg, put the name inside a function call to `info'."
  (interactive "P")
  (unless Info-current-node
    (error "No current Info node"))
  (let ((node (if (stringp Info-current-file)
		  (concat "(" (file-name-nondirectory Info-current-file) ") "
			  Info-current-node))))
    (if (zerop (prefix-numeric-value arg))
        (setq node (concat "(info \"" node "\")")))
    (unless (stringp Info-current-file)
      (setq node (format "(Info-find-node '%S '%S)"

       'Info-isearch-wrap)
  (set (make-local-variable 'isearch-push-state-function)
       'Info-isearch-push-state)
  (set (make-local-variable 'search-whitespace-regexp)
       Info-search-whitespace-regexp)
  (set (make-local-variable 'revert-buffer-function)
       'Info-revert-buffer-function)
  (Info-set-mode-line)
  (run-mode-hooks 'Info-mode-hook))

;; When an Info buffer is killed, make sure the associated tags buffer
;; is killed too.